lib_com/options.h

@@ -170,6 +170,7 @@
 #define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */
 #define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/
 #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/
+#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_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */
 #define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */
 #define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

lib_rend/lib_rend.c

@@ -2531,6 +2531,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 )
                     {
@@ -2549,7 +2552,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 ( ( error = initSbaPanGainsForMcOut( inputSba, IVAS_AUDIO_CONFIG_7_1_4, NULL ) ) != IVAS_ERR_OK )
                     {
                         return error;
@@ -6879,11 +6884,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: