Commit 15abc035 authored by vaclav's avatar vaclav Committed by Vladimir Malenovsky
Browse files

fixes to format switching

parent 7b44a28b

apps/decoder.c

+33 −0
Original line number Diff line number Diff line
@@ -4399,6 +4399,10 @@ static ivas_error restartDecoder( 


    IVAS_AUDIO_CONFIG outputConfig = ( decMode == IVAS_DEC_MODE_IVAS ) ? arg->outputConfig : IVAS_AUDIO_CONFIG_MONO;



    /*------------------------------------------------------------------------------------------*

     * Configure the decoder

     *------------------------------------------------------------------------------------------*/



    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg->output_Fs, outputConfig, arg->renderFramesize, arg->customLsOutputEnabled, arg->hrtfReaderEnabled,

                                       arg->enableHeadRotation, arg->enableExternalOrientation, arg->orientation_tracking, arg->renderConfigEnabled, arg->roomSize, arg->non_diegetic_pan_enabled,

                                       arg->non_diegetic_pan_gain, arg->dpidEnabled, aeID, arg->objEditEnabled, arg->delayCompensationEnabled ) ) != IVAS_ERR_OK )
@@ -4413,6 +4417,31 @@ static ivas_error restartDecoder( 
        goto cleanup;

    }



#ifdef FIX_VE

    /*------------------------------------------------------------------------------------------*

     * Configure Split rendering

     *------------------------------------------------------------------------------------------*/



    if ( arg->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nSplit rendering configure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg->renderFramesize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

    }

#endif



    /*------------------------------------------------------------------------------------------*

     * Configure VoIP mode

     *------------------------------------------------------------------------------------------*/



    if ( arg->voipMode )

    {

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg->inputFormat ) ) != IVAS_ERR_OK )
@@ -4444,6 +4473,10 @@ static ivas_error restartDecoder( 
        }

    }



    /*------------------------------------------------------------------------------------------*

     * Load custom loudspeaker layout data

     *------------------------------------------------------------------------------------------*/



    if ( arg->customLsOutputEnabled && hLsCustomData != NULL )

    {

        if ( ( error = IVAS_DEC_FeedCustomLsData( hIvasDec, *hLsCustomData ) ) != IVAS_ERR_OK )