Commit 9f466051 authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

compiler switch + changes for mr 1678

parent b8e6c2a0

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 


#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 */



/* #################### End BASOP porting switches ############################ */



#endif

lib_rend/lib_rend_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -2964,6 +2964,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 )

                    {
@@ -2983,7 +2986,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;
@@ -7843,11 +7848,18 @@ 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;

#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: