From 4d613f256e4a438bed056868cbb7723fc3521c96 Mon Sep 17 00:00:00 2001 From: rtyag Date: Mon, 11 Aug 2025 14:24:27 +1000 Subject: [PATCH] basop porting of mr 2048, float 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 a091cbe30..93fe1dc55 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -291,7 +291,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 6f13c8398..a11c3d91a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -201,7 +201,7 @@ #define NONBE_FIX_1130_DIV_ZERO_LEV_DUR /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */ #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