Commit 5cde2757 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1606_basop_port_fl1402' into 'main-pc' 

Port MR 1402 into main-pc

See merge request !1618
parents 32f8cd1f b32ddc42

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */



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

lib_dec/ivas_ism_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
        tc_nchan_full_new = tc_nchan_tc_new;

        move16();



#ifndef FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN

        test();

        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
@@ -379,6 +380,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
            move16();

        }



#endif

        test();

        test();

        test();