diff --git a/apps/decoder.c b/apps/decoder.c index 8a2d8a37b2cf04c53bacaa7e90f4114762230457..0e1d4c313ee967d1ca759e236d75411912b6bc36 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 b1f76d4691842b94af204db524dbba64fa4dd3c7..9022d06b7b55193a227a8e980da458ac6b4edf4a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -211,6 +211,7 @@ #define FIX_VOIP_FUNCTIONS /* VA: fix data type mismatch in IVAS_DEC_VoIP_SetScale() + add sanity checks to API functions */ #define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */ #define NONBE_1214_PLC_LSF_MEMORY /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */ +#define NONBE_1293_SR_HRTF /* VA: issue 1293: add support of external HRTFs in split rendering */ /* #################### End BASOP porting switches ############################ */