Commit e4123e02 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_2570_BUF_OVFL

parent df1432b0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */

#define HARMONIZE_2553_TonalConceal_Apply               /* FhG: Harmonize TonalMDCTConceal_Apply with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_Init                /* FhG: Harmonize TonalMDCTConceal_Init with its ivas derivate */

lib_rend/ivas_objectRenderer_sources_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -332,9 +332,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

    Word16 pan;

#endif

#ifdef FIX_2570_BUF_OVFL

    Word32 wrapped_angle;

#endif

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    Word16 pos_q;

    Word32 Src_p_tmp[3];
@@ -491,7 +489,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
        set32_fx( hrf_right, 0, *filterlength );

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#ifdef FIX_2570_BUF_OVFL

        IF( LT_32( L_add( ONE_IN_Q25, SrcSpatial_p->Pos_p_fx[1] ), 0 ) )

        {

            wrapped_angle = L_negate( L_add( ONE_IN_Q26, SrcSpatial_p->Pos_p_fx[1] ) );
@@ -506,9 +503,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
            move32();

        }

        pan = add( extract_h( L_shr( wrapped_angle, sub( SrcSpatial_p->q_Pos_p, Q21 ) ) ), 32 );

#else

        pan = add( extract_h( L_shr( SrcSpatial_p->Pos_p_fx[1], sub( SrcSpatial_p->q_Pos_p, Q21 ) ) ), 32 );

#endif

#else

        pan = add( mult_r( extract_h( SrcSpatial_p->Pos_p_fx[1] ), 2048 ), 32 );

#endif