Commit 4cb9d04c authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES

parent c32b5523

lib_com/options.h

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



#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES /* Dolby: Fix basop issue 1967 */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: float issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

#define FIX_2041_SPECTRAL_GAPS_FOR_INACTIVE_FRAMES      /* FhG: Using rounding in multiplication to improve precision in cngNoiseLevel[] */

#define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC   /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/

lib_dec/dec_tcx_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -4043,11 +4043,7 @@ void decoder_tcx_ivas_fx( 
    decoder_tcx_tns_fx( st, L_frame_glob, L_spec, L_frame, L_frameTCX, x_fx, fUseTns, &tnsData, bfi, frame_cnt, 0, NULL );



    Scale_sig32( x_fx, N_MAX, sub( x_e, 20 ) ); // Scaling x_fx to Q11

#ifdef NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES

    Scale_sig( xn_buf_fx, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX, -( Q14 - 2 ) ); // Scaling xn_buf_fx to Q(-2)

#else

    Scale_sig( xn_buf_fx, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX, sub( st->Q_syn, 14 ) ); // Scaling xn_buf_fx to Q_syn

#endif

    x_e = sub( 31, 11 );



    IF( st->igf != 0 )
@@ -5648,11 +5644,7 @@ void decoder_tcx_imdct_fx( 
        generate_masking_noise_mdct_ivas_fx( x_fx, &x_e, st->hFdCngDec->hFdCngCom );

        FOR( Word16 ind = 0; ind < L_frame; ind++ )

        {

#ifdef NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES

            x_fx[ind] = L_shl( x_fx[ind], sub( 31, add( x_e, q_x ) ) ); // q_x

#else

            x_fx[ind] = L_shr( x_fx[ind], sub( 31, add( x_e, q_x ) ) );                             // q_x

#endif

        }

    }