From 1c8bf9dc0a3b43c67d0051607262474b8437131c Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Sun, 13 Aug 2023 13:57:58 +0200 Subject: [PATCH 1/2] fix Linux compiler warning --- lib_dec/ivas_jbm_dec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index cc34a2d004..92de7a438c 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -2160,6 +2160,9 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( /* all renderers where we are done after TC decoding (might include DMX to mono/stereo */ case RENDERER_DISABLE: case RENDERER_MCMASA_MONO_STEREO: +#ifdef SBA_AND_OBJECTS + case RENDERER_OSBA_STEREO: +#endif case RENDERER_MONO_DOWNMIX: buffer_mode = TC_BUFFER_MODE_BUFFER; break; @@ -2175,6 +2178,10 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( case RENDERER_BINAURAL_MIXER_CONV: case RENDERER_BINAURAL_MIXER_CONV_ROOM: case RENDERER_NON_DIEGETIC_DOWNMIX: +#ifdef SBA_AND_OBJECTS: + case RENDERER_OSBA_AMBI: + case RENDERER_OSBA_LS: +#endif buffer_mode = TC_BUFFER_MODE_RENDERER; break; case RENDERER_MC_PARAMMC: -- GitLab From e16cf5dfa00e37dd3517b0109baf543f748ef341 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Sun, 13 Aug 2023 14:02:24 +0200 Subject: [PATCH 2/2] fix ifdef clause --- lib_dec/ivas_jbm_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 92de7a438c..ae3277fbc9 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -2178,7 +2178,7 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( case RENDERER_BINAURAL_MIXER_CONV: case RENDERER_BINAURAL_MIXER_CONV_ROOM: case RENDERER_NON_DIEGETIC_DOWNMIX: -#ifdef SBA_AND_OBJECTS: +#ifdef SBA_AND_OBJECTS case RENDERER_OSBA_AMBI: case RENDERER_OSBA_LS: #endif -- GitLab