Commit e941147f authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2252-msan-scaling-save_hb_synth' into 'main' 

Fix use-of-uninit-value in save_hb_synth_fx[] scaling

See merge request !2637
parents b8e4b44d a4a70537

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */

#define FIX_2245_INIT_FD_CNG_EVS                        /* Dolby/VA: Issue 2245: initialize FD CNG with EVS-type of init function */

#define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */



/* #################### End BE switches ################################## */

lib_dec/acelp_core_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -2334,9 +2334,17 @@ ivas_error acelp_core_dec_fx( 


    IF( NE_16( st->element_mode, EVS_MONO ) )

    {

#ifdef FIX_2252_SCALING_SAVE_HB_SYNTH

        IF( save_hb_synth_fx16 != NULL )

#else

        IF( save_hb_synth_fx16 )

#endif

        {

#ifdef FIX_2252_SCALING_SAVE_HB_SYNTH

            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, output_frame, 0 ); // Q0

#else

            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, L_FRAME48k, 0 ); // Q0

#endif

        }

        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2

    }