From d5e99acb48370f1283c3a7bccd77f3897b0a0e71 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Fri, 22 Sep 2023 08:21:32 +0200 Subject: [PATCH 1/3] fix variable speed decoding --- apps/decoder.c | 6 +++++- lib_com/options.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 68b73151ce..fe2aa2a48b 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1576,7 +1576,11 @@ static bool parseCmdlIVAS_dec( return false; } - if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) ) + if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) +#ifdef FIX_807_VARIABLE_SPEED_DECODING + && ( !arg->tsmEnabled ) +#endif + ) { arg->enable5ms = false; } diff --git a/lib_com/options.h b/lib_com/options.h index db4ab9dcdd..aa77a560f9 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -180,7 +180,7 @@ #define FIX_796_MCT_MODE_DIFF_JBM /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */ #define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK /* fix 755 */ #define FIX_803_SCE_MD_HANDLE /* VA: issue 803: Resolve "MD handle needed only for one SCE" */ - +#define FIX_807_VARIABLE_SPEED_DECODING /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */ /* #################### End BE switches ################################## */ -- GitLab From 61cbf756a67741cea1e86a3980308b07a871ab1d Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Fri, 22 Sep 2023 08:39:04 +0200 Subject: [PATCH 2/3] clang-format --- apps/decoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index fe2aa2a48b..c24e8ae810 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1576,11 +1576,11 @@ static bool parseCmdlIVAS_dec( return false; } - if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) + if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) #ifdef FIX_807_VARIABLE_SPEED_DECODING && ( !arg->tsmEnabled ) #endif - ) + ) { arg->enable5ms = false; } -- GitLab From fbf26e164ad346c1a7ad147852fa754ed4c8e826 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Fri, 22 Sep 2023 09:22:13 +0200 Subject: [PATCH 3/3] slight change in ordering in the ifdef block to ensure better formatting after cleanup --- apps/decoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index c24e8ae810..d4194ffece 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1576,11 +1576,12 @@ static bool parseCmdlIVAS_dec( return false; } - if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) #ifdef FIX_807_VARIABLE_SPEED_DECODING - && ( !arg->tsmEnabled ) + if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) && ( !arg->tsmEnabled ) ) +#else + if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) ) #endif - ) + { arg->enable5ms = false; } -- GitLab