Commit 1c5efba7 authored by Markus Werner's avatar Markus Werner
Browse files

Merge branch '1967-sba-decoder-mono-out-big-differences-between-basop-and-float' into 'main' 

[non-be]SBA decoder mono out: Big differences between BASOP and Float

Closes #1967

See merge request !2599
parents 14b96f3a 64ce086d

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_2015_PREMPH_SAT_ALT_PART2                   /* VA: Add missing scaling factor to be passed to AVQ_cod() */

#define FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH         /* VA: Fix Issue 2253 where the encoder and decoder could get out of sync */



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





/* ##################### End NON-BE switches ########################### */

lib_dec/dec_tcx_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -4044,7 +4044,11 @@ 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 )
@@ -5645,7 +5649,11 @@ 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

        }

    }