Commit 08510066 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch '718-md-udpate-flag-not-set-correctly-in-the-td-object-renderer-in-the-jbm-path' into 'main'

[Non-BE] Resolve "md udpate flag not set correctly in the TD object renderer in the JBM path"

See merge request !987
parents 10ad856f 93ac1f6d

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 
#define OSBA_SPLIT_RENDERING

#endif





#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */

lib_dec/ivas_objectRenderer_internal.c

+6 −0
Original line number Diff line number Diff line
@@ -233,7 +233,13 @@ ivas_error ivas_td_binaural_renderer_sf( 
        }



        /* Render subframe */

#ifdef FIX_718_JBM_MD_UDPATE

        /* ism_md_subframe_update_jbm != subframe_idx: trigger update only for ism_md_subframe_update_jbm == subframe_idx,

           where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are equal, and we want to enforce the update inside TDREND_GetMix to use subframe_idx == 0 */

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm != subframe_idx ) ) != IVAS_ERR_OK )

#else

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }