Commit 4a71486c authored by vaclav's avatar vaclav
Browse files

fix is_split_rendering_enabled()

parent 7e98df3d

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
        numSamplesPerChannelToDecode *= (int16_t) st_ivas->hDecoderConfig->render_framesize;

    }



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

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

    {

        return IVAS_ERR_WRONG_PARAMS;

    }
@@ -4115,7 +4115,7 @@ ivas_error IVAS_DEC_is_split_rendering_enabled( 


    st_ivas = hIvasDec->st_ivas;



    *isSplitRend = is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig->split_rend_config.dof );

    *isSplitRend = is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig );



    return IVAS_ERR_OK;

}

lib_rend/ivas_output_init.c

+3 −3
Original line number Diff line number Diff line
@@ -478,11 +478,11 @@ ivas_error ivas_output_buff_dec( 
/*! r: flag to indicate if split rendering is enabled */

int16_t is_split_rendering_enabled(

    const DECODER_CONFIG_HANDLE hDecoderConfig,   /* i  : configuration structure         */

    const int16_t dof                           /* i  : flag to specify if pose correction is needed */

    const IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* i  : Render config data structure    */

)

{

    if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ||

         ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO && hDecoderConfig->Opt_non_diegetic_pan && dof == 0 ) )

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

    {

        return 1;

    }

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int16_t ivas_get_nchan_buffers_dec( 
/*! r: flag to indicate if split rendering is enabled */

int16_t is_split_rendering_enabled(

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                         */

    const int16_t dof                                           /* i  : flag to specify if pose correction is needed    */

    const IVAS_RENDER_CONFIG_HANDLE hRenderConfig               /* i  : Render config data structure                    */

);

#endif