Commit 3b65ce59 authored by vaillancour's avatar vaillancour
Browse files

possible fix for 2312, condition missing in GSC-dec

parent a0051869
Loading
Loading
Loading
Loading
Loading
+41 −31
Original line number Diff line number Diff line
@@ -1193,7 +1193,10 @@ Word16 gsc_gaindec_ivas_fx( /* o : average frequenc
             *--------------------------------------------------------------------------------------*/
            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 );

@@ -1232,6 +1235,13 @@ Word16 gsc_gaindec_ivas_fx( /* o : average frequenc
                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
        {
+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@
#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */
#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */
#define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */

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

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