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

port MR 1411 from float 

external target interpolation was different between framesizes
parent 06323e73

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

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



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

lib_rend/ivas_rotation.c

+4 −0
Original line number Diff line number Diff line
@@ -804,14 +804,18 @@ 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;