Commit 5cb6587d authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 1785-10ms_Rendering_Assert_in_ivas_jbm_dec_render_fx()_scale_sig32

parents 07de37b3 d6d0d0fa

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ typedef enum 
/* format signaling in SID frames */

#define SID_FORMAT_NBITS                        3                           /* Bit 0 | Bit 1 | Bit 2 */

                                                                            /*-------|-------|------ */

#ifdef FIX_1384_MSAN_ivas_spar_dec_open

#define SID_FORMAT_NONE                         (-0x1)                      /*    n/a|    n/a|    n/a*/

#endif

#define SID_DFT_STEREO                          0x0                         /*      0|      0|     0 */

#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#define NONBE_1293_CRASH_FIRST_FRAME_LOST               /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */

#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

lib_dec/ivas_init_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,10 @@ ivas_error ivas_init_decoder_front( 
    move32();

    st_ivas->mc_mode = MC_MODE_NONE;

    move32();

#ifdef FIX_1384_MSAN_ivas_spar_dec_open

    st_ivas->sid_format = SID_FORMAT_NONE;

    move16();

#endif

    st_ivas->sba_dirac_stereo_flag = 0;

    move16();