Commit 7427dc71 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1159_SPLIT_RENDERING_CONFIG

parent 91777a61

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 
#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

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



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2230,17 +2230,13 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
        hRenderConfig->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    }



#ifdef FIX_1159_SPLIT_RENDERING_CONFIG

    if ( is_split_rendering_enabled( hIvasDec->st_ivas->hDecoderConfig, hRenderConfig ) )

    {

#endif

        if ( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasDec->st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#ifdef FIX_1159_SPLIT_RENDERING_CONFIG

    }

#endif



    return IVAS_ERR_OK;

}

lib_rend/lib_rend.c

+0 −7
Original line number Diff line number Diff line
@@ -609,9 +609,6 @@ static ivas_error validateOutputSampleRate( 
        /* Otherwise rendering to binaural, support the same set as IVAS decoder */

        switch ( sampleRate )

        {

#ifndef FIX_1159_SPLIT_RENDERING_CONFIG

            case 8000:

#endif

            case 16000:

            case 32000:

            case 48000:
@@ -4463,17 +4460,13 @@ ivas_error IVAS_REND_FeedRenderConfig( 


    hRenderConfig->split_rend_config.codec = renderConfig.split_rend_config.codec;



#ifdef FIX_1159_SPLIT_RENDERING_CONFIG

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

    {

#endif

        if ( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#ifdef FIX_1159_SPLIT_RENDERING_CONFIG

    }

#endif



    /* Must re-initialize split rendering config in case renderer config is updated after adding renderer inputs */

    /* if its not initialized yet then no need to re-initialize, initialization will happen while adding inputs*/