Commit eb2ff931 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents 1baddbd7 7797b371
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@

#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */
#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 */


/* ################## End DEVELOPMENT switches ######################### */
+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static void encode_angle_indices(
    if ( *flag_abs_angle1 == 0 )
    {
        angle->angle1_diff_cnt++;
#ifdef ISM_BUG_FIX
#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 );