Commit 78593ba4 authored by malenov's avatar malenov
Browse files

merge branch 'main' into '414-out-of-array-access-in-dft-stereo-cna'

parents 18d84b45 7797b371

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */

#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

#define FIX_I414_OOA_CNA                                /* VA: Issue 414: Fixing out-of-array write operation in stereo CNA */

lib_enc/ivas_ism_metadata_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -850,7 +850,11 @@ static void encode_angle_indices( 
    if ( *flag_abs_angle1 == 0 )

    {

        angle->angle1_diff_cnt++;

#ifdef FIX_419_ISM_MD_FIX

        angle->angle1_diff_cnt = min( angle->angle1_diff_cnt, ISM_FEC_MAX );

#else

        angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX );

#endif

    }

    else

    {