Commit 2f05eceb authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch '2008-fx-encoder-wrong-bandwidth-behaviour-for-omasa-3-objects-at-48-kbps-with-characterization-items-float-update' into 'ivas-float-update'

[Non-BE] Resolve 2008 by reintroducing deleted code in ivas-float-update

See merge request !2242
parents a6dfe7ea cf0cd0e9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 
#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN               /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */



#define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/

/* #################### End BASOP porting switches ############################ */



/* clang-format on */

lib_enc/ivas_stereo_dft_enc_itd.c

+5 −0
Original line number Diff line number Diff line
@@ -729,6 +729,11 @@ void stereo_dft_enc_compute_itd( 
        grand_dot_prod_img += xcorr[2 * i + 1];

        xcorr_abs[i] = sqrtf( xcorr[2 * i] * xcorr[2 * i] + xcorr[2 * i + 1] * xcorr[2 * i + 1] );



#ifdef FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING

        prod_LL = prod_L;

        prod_RR = prod_R;

#endif



        if ( j == SFM_PROD_GRP || i == NFFT_mid - 1 )

        {

            prod_L = max( FLT_MIN, prod_L );