Commit a5268565 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_490_MASA_2TC_LBR_DTX

parent f6ce6460

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 


/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */

#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */



#define FIX_163_SBA_TD_DECORR_OPT                       /* Dlb : Issue 163 : TD decorr state optimization in SBA for certain output formats */

lib_dec/ivas_masa_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -604,11 +604,7 @@ void ivas_masa_prerender( 
    const int16_t output_frame  /* i  : output frame length per channel             */

)

{

#ifdef FIX_490_MASA_2TC_LBR_DTX

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 )

#endif

    {

        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

        {