Commit d8cc6943 authored by vaillancour's avatar vaillancour
Browse files

proposed fix to 2588, adding possible missing condition

parent b95eb136

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

#define FIX_2584_TD_SM_ISSUE                            /* VA: Fix inconsistencies in the SM part of the TD stereo */

#define FIX_2556_ALIGN_CONDITIONS                       /* VA: Fix different conditions that were not exact between float and fix, BE on self-test */



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

/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_dec/lsf_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -409,7 +409,11 @@ 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

    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 */