Commit 1662fecf authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1129_EXT_REND_OUTPUT_HIGH

parent 7d2c87af

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#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_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

lib_rend/lib_rend.c

+0 −13
Original line number Diff line number Diff line
@@ -2553,9 +2553,7 @@ 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 == IVAS_BIN_RENDERER_TYPE_FASTCONV )

                    {
@@ -2574,9 +2572,6 @@ 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;
@@ -6885,19 +6880,11 @@ 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: