Skip to content
Commits on Source (15)
......@@ -146,6 +146,8 @@
#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */
#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
#define NONBE_1289_STEREO_SW_TO_MONO /* VA: issue 1289: Fix glitch when stereo signal is decoded to mono n TD->DFT switching */
#define NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION /* Ericsson: Issue 1196, Always apply filter interpolation for each subframe */
#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
......
......@@ -3038,6 +3038,9 @@ static ivas_error updateSbaPanGains(
break;
}
case IVAS_AUDIO_CONFIG_BINAURAL:
#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:
#endif
{
if ( hRendCfg->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )
{
......@@ -3056,7 +3059,9 @@ static ivas_error updateSbaPanGains(
}
BREAK;
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:
#ifndef FIX_1129_EXT_REND_OUTPUT_HIGH
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:
#endif
IF( NE_32( ( error = initSbaPanGainsForMcOut( inputSba, IVAS_AUDIO_CONFIG_7_1_4, NULL ) ), IVAS_ERR_OK ) )
{
return error;
......@@ -8071,11 +8076,19 @@ static ivas_error renderInputSba(
case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:
error = renderSbaToSplitBinaural( sbaInput, outConfig, outAudio );
break;
#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH
case IVAS_AUDIO_CONFIG_BINAURAL:
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:
error = renderSbaToBinaural( sbaInput, outConfig, outAudio );
break;
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:
#else
case IVAS_AUDIO_CONFIG_BINAURAL:
error = renderSbaToBinaural( sbaInput, outConfig, outAudio );
BREAK;
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:
case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:
#endif
error = renderSbaToBinauralRoom( sbaInput, outConfig, outAudio );
BREAK;
default:
......