Commit c4f46c08 authored by norvell's avatar norvell
Browse files

Merge branch '2079_basop_PortMR2056_TD_renderer_OOB' into 'main' 

[Non-BE][Renderer Non-BE][Split Non-BE][allow regression]Add fix NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS to port MR2056 - basop part

See merge request !2338
parents b524fd7b d4efa24d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */

#define NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS      /* Eri: issue 1296: ITD resampling can occasionally read out of bounds, especially when the requested subframes are short (1.25 ms). Seen for headtracking+JBM. */



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_objectRenderer_sfx_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -252,8 +252,9 @@ static void sincResample_fx( 
            p_backward_fx--;                                                                                                                     // Qx

        }



#ifndef NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS

        tmp64_fx = W_mac_32_32( tmp64_fx, *p_forward_fx, *p_sinc_forward_fx ); /* Integer index always rounded down --> 4 steps backward, 5 steps forward */ // Qx + 32



#endif

        output_fx[i] = W_extract_h( tmp64_fx ); // Qx

        move32();