Commit 12c138f3 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2588-condition-seem-missing-in-lsf_dec' into 'main' 

Resolve "basop-2588-condition-seem-missing-in-lsf_dec"

Closes #2588

See merge request !3033
parents e0ce18e7 a1f850de

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ 
#define FIX_BASOP_2591_EDGE_DETECT_COMP                 /* FhG: BASOP #2591: Wrong comparison in edge_detect_fx() */

#define FIX_NONBE_2580_USE_LENGTH_NOT_CONSTANT          /* Dolby: fix 2580: use dynamic length denominator for average energy in unclr_calc_corr_features_fx() */

#define FIX_BASOP_2599_TCA_OVERFLOW                     /* VA: issue 2599, Fix TCA overflow */

#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

+5 −0
Original line number Diff line number Diff line
@@ -409,7 +409,12 @@ 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 */