Commit ae82a114 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2297_SBA_SCALING_32KHZ

parent 7a195933

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

#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_2315_AGC_MEMORY_RESET                       /* VA: basop issue 2315: fix reset of the AGC memory */

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

lib_dec/ivas_jbm_dec_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -401,11 +401,7 @@ ivas_error ivas_dec_fx( 
                move16();

                FOR( i = 0; i < 2; i++ )

                {

#ifdef FIX_2297_SBA_SCALING_32KHZ

                    s = s_min( s, L_norm_arr( p_output_fx[i], output_frame ) - 11 ) /* Guard bits */;

#else

                    s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */

#endif

                }

                FOR( i = 0; i < 2; i++ )

                {
@@ -971,11 +967,7 @@ ivas_error ivas_dec_fx( 
        move16();

        FOR( i = 0; i < 2; i++ )

        {

#ifdef FIX_2297_SBA_SCALING_32KHZ

            s = s_min( s, L_norm_arr( p_output_fx[sba_ch_idx + i], output_frame ) - 11 /* Guard bits */ );

#else

            s = s_min( s, L_norm_arr( p_output_fx[sba_ch_idx + i], L_FRAME48k ) - 11 /* Guard bits */ );

#endif

        }

        FOR( i = 0; i < 2; i++ )

        {
@@ -1452,11 +1444,7 @@ ivas_error ivas_dec_fx( 
            move16();

            FOR( i = 0; i < 2; i++ )

            {

#ifdef FIX_2297_SBA_SCALING_32KHZ

                s = s_min( s, L_norm_arr( p_output_fx[i], output_frame ) - 11 /* Guard bits */ );

#else

                s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 /* Guard bits */ );

#endif

            }

            FOR( i = 0; i < 2; i++ )

            {

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1285,11 +1285,7 @@ void ivas_sba_dirac_stereo_dec_fx( 
    move16();

    FOR( i = 0; i < CPE_CHANNELS; i++ )

    {

#ifdef FIX_2297_SBA_SCALING_32KHZ

        s = s_min( s, L_norm_arr( output[i], output_frame ) - Q11 ) /* Guard bits */;

#else

        s = s_min( s, L_norm_arr( output[i], L_FRAME48k ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */

#endif

    }

    FOR( i = 0; i < CPE_CHANNELS; i++ )

    {