Commit 440c2cb0 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1964_basop_port_mr_1700_masa_rateswitch_to_13_2_16_4' into 'main' 

[non-BE][allow-regression] Port float MR 1700 to BASOP

See merge request !2163
parents a80be2c4 94e8fc72

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */

#define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */

#define NONBE_FIX_1261_MASA_EXT_META_JBM                /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */

#define NONBE_FIX_1143_MASA_BRSW                        /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */



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

lib_dec/ivas_masa_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1823,8 +1823,16 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        test();

        test();

        test();

#ifdef NONBE_FIX_1143_MASA_BRSW

        test();

        test();

        IF( ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && GE_32( last_ivas_total_brate, MASA_STEREO_MIN_BITRATE ) ) ||

            ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, FRAME_NO_DATA ) ) ||

            ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, IVAS_SID_5k2 ) ) )

#else

        IF( ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && GE_32( last_ivas_total_brate, MASA_STEREO_MIN_BITRATE ) ) ||

            ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, FRAME_NO_DATA ) ) )

#endif

        {

            st_ivas->hCPE[cpe_id]->nchan_out = 1;

            move16();