Commit f3c2d135 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2588_MISSING_CONDITIONS

parent f41cfac8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_2588_MISSING_CONDITIONS                     /* VA: Proposed fix to 2588, addition of a condition in lsf_dec */

#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Increase accuracy of computations and add additional gain clamp for low energy decorrelated signal rendering. */

#define FIX_FMSW_DEC_EXT                                /* float issue 1566: fix EXT output in format switching */

lib_dec/lsf_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -409,12 +409,8 @@ void lsf_end_dec_fx( 


    test();

    test();

#ifndef FIX_2588_MISSING_CONDITIONS

    IF( ( EQ_16( coder_type_org, GENERIC ) ) && ( EQ_32( st->sr_core, INT_FS_16k ) ) && ( mode2_flag == 0 ) )

#else

    test();

    IF( ( EQ_16( coder_type_org, GENERIC ) ) && ( EQ_32( st->sr_core, INT_FS_16k ) ) && ( mode2_flag == 0 ) && st->idchan == 0 )

#endif

    {

        /* this bit is used only for primary channel or mono */

        coder_type = (Word16) get_next_indice_fx( st, 1 ); /* Q0 */