Commit f588daa0 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into FhG/multichannel-jbm

parents 04501bbb f8397e59

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

lib_com/bitstream.c

+2 −0
Original line number Diff line number Diff line
@@ -879,10 +879,12 @@ static ivas_error write_indices_element( 


        for ( n = 0; n < n_channels; n++ )

        {

#ifndef MC_BITRATE_SWITCHING

            if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) )

            {

                continue;

            }

#endif

            reset_indices_enc( sts[n]->hBstr, MAX_NUM_INDICES );

        }

    }

lib_com/delay_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ int32_t get_delay( 
        else /* IVAS */

        {

            delay = IVAS_DEC_DELAY_NS;



#ifdef FIX_I59_LFE_TD_DELAY

            if ( hCldfb != NULL )

            {

lib_com/ivas_mc_param_com.c

+98 −1
Original line number Diff line number Diff line
@@ -330,6 +330,100 @@ void ivas_param_mc_default_icc_map( 
}





#ifdef MC_BITRATE_SWITCHING

/*-------------------------------------------------------------------------

 * ivas_param_mc_get_num_param_bands()

 *

 *

 *------------------------------------------------------------------------*/



static int16_t ivas_param_mc_get_num_param_bands(

    const MC_LS_SETUP mc_ls_setup, /* i  : MC ls setup                      */

    const int32_t ivas_total_brate /* i  : IVAS total bitrate               */

)

{

    int16_t num_parameter_bands;



    num_parameter_bands = 0;



    /* parameter bands */

    switch ( mc_ls_setup )

    {

        case MC_LS_SETUP_5_1:

            switch ( ivas_total_brate )

            {

                case IVAS_48k:

                    num_parameter_bands = 10;

                    break;

                case IVAS_64k:

                case IVAS_80k:

                    num_parameter_bands = 14;

                    break;

                default:

                    assert( 0 && "PARAM_MC: bitrate for CICP6 not supported!" );

            }

            break;



        case MC_LS_SETUP_7_1:

            switch ( ivas_total_brate )

            {

                case IVAS_48k:

                    num_parameter_bands = 10;

                    break;

                case IVAS_64k:

                case IVAS_80k:

                    num_parameter_bands = 14;

                    break;

                case IVAS_96k:

                    num_parameter_bands = 20;

                    break;

            }

            break;

        case MC_LS_SETUP_5_1_2:

            switch ( ivas_total_brate )

            {

                case IVAS_48k:

                    num_parameter_bands = 10;

                    break;

                case IVAS_64k:

                case IVAS_80k:

                    num_parameter_bands = 14;

                    break;

                case IVAS_96k:

                    num_parameter_bands = 20;

                    break;

            }

            break;

        case MC_LS_SETUP_5_1_4:

            switch ( ivas_total_brate )

            {

                case IVAS_96k:

                    num_parameter_bands = 14;

                    break;

                case IVAS_128k:

                    num_parameter_bands = 20;

                    break;

            }

            break;

        case MC_LS_SETUP_7_1_4:

            switch ( ivas_total_brate )

            {

                case IVAS_128k:

                    num_parameter_bands = 20;

                    break;

                case IVAS_160k:

                    num_parameter_bands = 20;

                    break;

            }

            break;

        default:

            assert( 0 && "PARAM_MC: channel configuration not supportet!" );

    }



    return num_parameter_bands;

}

#endif



/*-------------------------------------------------------------------------

 * Local functions

 *------------------------------------------------------------------------*/
@@ -427,6 +521,9 @@ static void ivas_param_mc_set_coding_scheme( 
            assert( 0 && "PARAM_MC: channel configuration not supported!" );

    }



#ifdef MC_BITRATE_SWITCHING

    hMetadataPMC->num_parameter_bands = ivas_param_mc_get_num_param_bands( mc_ls_setup, ivas_total_brate );

#else

    /* parameter bands */

    switch ( mc_ls_setup )

    {
@@ -500,6 +597,6 @@ static void ivas_param_mc_set_coding_scheme( 
        default:

            assert( 0 && "PARAM_MC: channel configuration not supportet!" );

    }



#endif

    return;

}