From c5c22ce14eb4212e2f68fd26cc5fbeed98966706 Mon Sep 17 00:00:00 2001 From: rtyag Date: Mon, 11 Aug 2025 14:29:06 +1000 Subject: [PATCH] basop porting of mr 2048, basop branch --- apps/decoder.c | 4 ++++ lib_com/options.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/decoder.c b/apps/decoder.c index 179ad3273..b83a0bf97 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -258,7 +258,11 @@ int main( if ( arg.hrtfReaderEnabled ) { /* sanity check */ +#ifdef NONBE_1293_SR_HRTF + if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) +#else if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) +#endif { arg.hrtfReaderEnabled = false; fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" ); diff --git a/lib_com/options.h b/lib_com/options.h index 81f280e9c..d9b94e80a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -127,7 +127,7 @@ #define NONBE_1325_TD_STEREO_QUANT_LSF_SEC /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */ #define NONBE_1329_FIX_OSBA_CRASH /* FhG: issue 1329: prevent assert when bit budget is low*/ #define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */ - +#define NONBE_1293_SR_HRTF /* VA: issue 1293: add support of external HRTFs in split rendering */ /* #################### End BASOP porting switches ############################ */ -- GitLab