From 8419b0edd56fa06bb504ce96d7cb5b2f97b84771 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Tue, 15 Aug 2023 08:00:11 +0200 Subject: [PATCH] move orientation tracking type setting to `ivas_init_decoder_front()` --- lib_com/options.h | 2 +- lib_dec/ivas_init_dec.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 9769123af1..85966e5427 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -171,7 +171,7 @@ #define FIX_264_AUDIO_CHANNELS_TO_HEAP /* VA: issue 243: Move audio channels memory from stack to heap */ #define FIX_691_OSBA_CRASH /* FhG: Fix for issue 691: Crash for OSBA Stereo out */ #define FIX_694_OMASA_EXTREME /* Nokia: fix for crash in OMASA on extreme sample */ - +#define FIX_551_HEADTRACKER_INIT /* FhG: move setting of orientation tracking type to earlier */ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index aeb0f89cca..60a092b63b 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -975,6 +975,12 @@ ivas_error ivas_init_decoder_front( { return error; } +#ifdef FIX_551_HEADTRACKER_INIT + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, st_ivas->hDecoderConfig->orientation_tracking ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif } /*-------------------------------------------------------------------* @@ -1180,6 +1186,7 @@ ivas_error ivas_init_decoder( } } +#ifndef FIX_551_HEADTRACKER_INIT /*-----------------------------------------------------------------* * Set head/orientation tracking *-----------------------------------------------------------------*/ @@ -1191,6 +1198,7 @@ ivas_error ivas_init_decoder( return error; } } +#endif #ifdef SPLIT_REND_WITH_HEAD_ROT /*-----------------------------------------------------------------* -- GitLab