From 30137274fc9d4fe9ee29dfa2d2475b3f599a5d7f Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sat, 4 Oct 2025 15:04:37 +0200 Subject: [PATCH] port Float MR1679 to ivas-float-update --- lib_com/options.h | 1 + lib_dec/lib_dec.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index afb4e5bf8..909061536 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -192,6 +192,7 @@ #define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/ #define ADJUST_MCT_CHANNELS_MAX /* FhG: set correct max mct channels constant*/ #define FIX_1053_REVERB_RECONFIGURATION +#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 81545fc6b..25cf78924 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3040,6 +3040,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples( return IVAS_ERR_WRONG_PARAMS; } +#ifdef TMP_FIX_1119_SPLIT_RENDERING_VOIP + if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || + hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) + { + return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Split rendering is not integrated with VoIP mode" ); + } +#endif + /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */ #ifdef FIX_CREND_SIMPLIFY_CODE while ( *nSamplesRendered < nSamplesPerChannel ) -- GitLab