Commit 589ef91e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1008_EXTORIENT_TARGET_INTERPOLATION

parent 5c7128e0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1008_EXTORIENT_TARGET_INTERPOLATION         /* FhG: issue #1008, external orientation init was wrong for 5ms */

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

lib_rend/ivas_rotation.c

+0 −11
Original line number Diff line number Diff line
@@ -898,18 +898,7 @@ ivas_error ivas_combined_orientation_open( 
    ( *hCombinedOrientationData )->num_subframes = num_subframes;

    ( *hCombinedOrientationData )->interpolationCoefficient = 1.0f;

    ( *hCombinedOrientationData )->interpolationIncrement = 1.0f;

#ifndef FIX_1008_EXTORIENT_TARGET_INTERPOLATION

    if ( num_subframes == 1 )

    {

        ( *hCombinedOrientationData )->maximumFramesToTargetOrientation = 2000;

    }

    else

    {

#endif

        ( *hCombinedOrientationData )->maximumFramesToTargetOrientation = 500;

#ifndef FIX_1008_EXTORIENT_TARGET_INTERPOLATION

    }

#endif

    ( *hCombinedOrientationData )->lrSwitchedNext = 0;

    ( *hCombinedOrientationData )->lrSwitchedCurrent = 0;

    ( *hCombinedOrientationData )->lrSwitchInterpVal = 0.0f;