Commit 4e2e483b authored by TYAGIRIS's avatar TYAGIRIS
Browse files

using the new utility function to check if split rendering is enabled

parent 4a71486c

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ ivas_error ivas_jbm_dec_render( 
        nchan_out_syn_output = nchan_out;

    }



    if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    if ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )
@@ -1808,7 +1808,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 


    /* Only write out the valid data*/

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( !( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    if ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )

lib_dec/lib_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -1356,10 +1356,7 @@ static ivas_error IVAS_DEC_Setup( 
         * - initialize ISAR handle at the first frame

         * - reconfigure the ISAR handle in case of bitrate switching (renderer might change)

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



        if ( st_ivas->ini_frame == 0 && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

                                          st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ||

                                          ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->Opt_non_diegetic_pan && st_ivas->hRenderConfig->split_rend_config.dof == 0 ) ) )

        if ( st_ivas->ini_frame == 0 && ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) ) )

        {

            if ( ( error = ivas_dec_init_split_rend( st_ivas ) ) != IVAS_ERR_OK )

            {