Commit 91777a61 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1129_EXT_REND_OUTPUT_HIGH

parent 4e0c3f63

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
/*#define FIX_1123_PARAMBIN_16BIT_ROM*/                 /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#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 FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */

#define FIX_1159_SPLIT_RENDERING_CONFIG                 /* VA: issue 1159: Execute split rendering config only for split rendering outputs. */

lib_rend/lib_rend.c

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

                    {

                        if ( ( error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, &rendCtx.pSplitRendWrapper->multiBinPoseData, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
@@ -2590,9 +2588,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;
@@ -6923,19 +6918,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: