Commit b1148c82 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2312_CONDITION_MISSING_GSC_DEC_LR

parent 49fca380

lib_com/gs_gains_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1074,10 +1074,8 @@ Word16 gsc_gaindec_fx( 


            idx_g_fx = (Word16) get_next_indice_fx( st_fx, 5 );

            VDQ_vec_fx( y_gainQ_fx, YGain_mean_LR_fx, YGain_dic1_LR_fx, idx_g_fx, 3 );

#ifdef FIX_2312_CONDITION_MISSING_GSC_DEC_LR

            IF( !( coder_type == INACTIVE && st_fx->tdm_LRTD_flag == 0 && EQ_16( st_fx->idchan, 1 ) ) || GT_32( st_fx->core_brate, GSC_LRES_GAINQ_LIMIT ) )

            {

#endif

                idx_g_fx = (Word16) get_next_indice_fx( st_fx, 5 );

                VDQ_vec_fx( y_gainQ_fx + 3, YGain_mean_LR_fx + 3, YGain_dic2_LR_fx, idx_g_fx, 4 );
@@ -1118,13 +1116,11 @@ Word16 gsc_gaindec_fx( 
                move16();

                y_gainQ_fx[14] = y_gain_tmp3_fx[3]; /*Q12*/

                move16();

#ifdef FIX_2312_CONDITION_MISSING_GSC_DEC_LR

            }

            ELSE

            {

                set16_fx( y_gainQ_fx + 3, 0, MBANDS_GN16k - 3 );

            }

#endif

        }

        ELSE

        {

lib_com/options.h

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



#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2312_CONDITION_MISSING_GSC_DEC_LR           /* VA: basop issue 2297: addition of condition missing in the GSC gain decoder at low-rate */

#define FIX_2313_HF_RESET_16KHZ                         /* VA: basop issue 2313: Call hf_synth_reset_fx() also for 16 kHz output_Fs */

#define OPT_2308_FIND_TARGET                            /* VA: Issue 2308, Speeds up computation and improve accuracy of the impulse response */

#define OPT_NBE_2311_HARM_GSC_GAIN                      /* VA: issue 2311: non-BE part of the GSC gain harmonization */