Commit 84b13448 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch '1143-msan-use-of-uninitialized-value-in-masa-decoding-to-binaural-with-dtx-bitrate-switching-and-5' into 'main'

[nonBE] Fix for MASA bitrate switch to 13.2k and 16.4k

See merge request !1700
parents 0b33efae daf8c5a2

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 


#define NONBE_FIX_1141_OSBA_ROOM_RENDERING                    /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#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 */





#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

lib_dec/ivas_masa_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1393,11 +1393,16 @@ ivas_error ivas_masa_dec_reconfigure( 
        sts = st_ivas->hCPE[cpe_id]->hCoreCoder;

        sts[0]->bit_stream = bit_stream + num_bits;

        num_bits += (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );

#ifdef NONBE_FIX_1143_MASA_BRSW

        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == IVAS_SID_5k2 ) )

#else

        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) )

#endif

        {

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



            if ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL ) || ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL ) )

            {

                if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )