Commit 020a8d61 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1611_basop_external_target_interpolation_different_between_framesizes' into 'main-pc' 

port MR 1411 from float

See merge request !1730
parents 7ae27c06 1c14d249

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ 
#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 NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */



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



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



#endif

lib_rend/ivas_rotation_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,7 @@ ivas_error ivas_combined_orientation_open( 
    move32();

    ( *hCombinedOrientationData )->interpolationIncrement_fx = ONE_IN_Q30; // Q30

    move32();

#ifndef FIX_1008_EXTORIENT_TARGET_INTERPOLATION

    IF( EQ_16( num_subframes, 1 ) )

    {

        ( *hCombinedOrientationData )->maximumFramesToTargetOrientation = 2000;
@@ -1386,9 +1387,12 @@ ivas_error ivas_combined_orientation_open( 
    }

    ELSE

    {

#endif

        ( *hCombinedOrientationData )->maximumFramesToTargetOrientation = 500;

        move16();

#ifndef FIX_1008_EXTORIENT_TARGET_INTERPOLATION

    }

#endif

    ( *hCombinedOrientationData )->lrSwitchedNext = 0;

    move16();

    ( *hCombinedOrientationData )->lrSwitchedCurrent = 0;