Commit c1bdb556 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Additional cleanup

parent dfc8b88c

lib_rend/lib_rend.c

+14 −0
Original line number Diff line number Diff line
@@ -947,7 +947,11 @@ static ivas_error initEfap( 
    const float *elevations;

    int16_t numNonLfeChannels;



#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

#else

    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        pEfapWrapper->speakerConfig = IVAS_AUDIO_CONFIG_7_1_4;

    }
@@ -1999,9 +2003,14 @@ static ivas_error updateMcPanGains( 
                case IVAS_AUDIO_CONFIG_BINAURAL:

                case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED:

                case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:

#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    break; /* Do nothing */

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

#ifndef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    /* Prepare rendering to intermediate format */

                    error = updateMcPanGainsForMcOut( inputMc, IVAS_AUDIO_CONFIG_7_1_4 );

                    break;
@@ -6273,10 +6282,15 @@ static ivas_error renderInputMc( 
            switch ( outConfig )

            {

                case IVAS_AUDIO_CONFIG_BINAURAL:

#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    error = renderMcToBinaural( mcInput, outConfig, outAudio );

                    break;

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

#ifndef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    if ( mcInput->base.inConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

                    {

                        error = renderMcCustomLsToBinauralRoom( mcInput, outConfig, outAudio );