Commit de0a7356 authored by fotopoulou's avatar fotopoulou
Browse files

merge all changes under define MC_BITRATE_SWITCHING

parent fbec58d3

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -2604,7 +2604,7 @@ ivas_error stereo_memory_dec( 
    const int16_t nb_bits_metadata,                             /* i  : number of metadata bits                 */

    const int32_t output_Fs,                                    /* i  : output sampling rate                    */

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT

#ifdef MC_BITRATE_SWITCHING

    const MC_MODE mc_mode,                                      /* i  : MC mode                                 */

#endif

    const int16_t nchan_transport                               /* i  : number of transport channels            */

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ 




#define MC_BITRATE_SWITCHING                            /* Issue 116: support bitrate switching in MC format  */

#define MC_BITRATE_SWITCHING_CLDFB

#define FIX_MC_BR_SW_TCX_PLC_FADEOUT

#define FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON

lib_dec/ivas_cpe_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ivas_error ivas_cpe_dec( 
     * dynamically allocate data structures depending on the actual stereo mode

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



#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT

#ifdef MC_BITRATE_SWITCHING

    if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )

#else

    if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )

lib_dec/ivas_mct_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static ivas_error ivas_mc_dec_reconfig( 
)

{

    int16_t nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old, nchan_hp20_old;

#ifdef MC_BITRATE_SWITCHING_CLDFB

#ifdef MC_BITRATE_SWITCHING

    int16_t numCldfbAnalyses_old, numCldfbSyntheses_old;

#else

    int16_t numCldfbAnalyses_old, numCldfbAnalyses, numCldfbSyntheses, numCldfbSyntheses_old, i;
@@ -959,7 +959,7 @@ static ivas_error ivas_mc_dec_reconfig( 
     * CLDFB instances

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



#ifdef MC_BITRATE_SWITCHING_CLDFB

#ifdef MC_BITRATE_SWITCHING

    ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old );



#else

lib_dec/ivas_stereo_switching_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ ivas_error stereo_memory_dec( 
    const int16_t nb_bits_metadata, /* i  : number of metadata bits     */

    const int32_t output_Fs,        /* i  : output sampling rate        */

    const IVAS_FORMAT ivas_format,  /* i  : IVAS format                 */

#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT

#ifdef MC_BITRATE_SWITCHING

    const MC_MODE mc_mode, /* i  : MC mode                     */

#endif

    const int16_t nchan_transport /* i  : number of transport channels*/
@@ -958,7 +958,7 @@ ivas_error stereo_memory_dec( 
        }

    }



#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT

#ifdef MC_BITRATE_SWITCHING

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

     * Bitrate switching in MASA format

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