Commit 7b4ed858 authored by vaclav's avatar vaclav
Browse files

activate FIX_356_ISM_METADATA_SYNC; intorduce FIX_356_ISM_METADATA_SYNC_OMASA... 

activate FIX_356_ISM_METADATA_SYNC; intorduce FIX_356_ISM_METADATA_SYNC_OMASA to temporarily keep BE in OMASA
parent e380832a

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ 
#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */



/* Todo OMASA: This switch causes more difference for OMASA path. Thus, disabled for OMASA currently. Enable to get BE to main. */

/*#define FIX_356_ISM_METADATA_SYNC*/                       /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */

#define FIX_356_ISM_METADATA_SYNC                       /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */



#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */
@@ -230,6 +229,7 @@ 
#define OMASA_ENERGIES

#define FIX_OMASA_STEREO_SWITCHING                      /* VA: introduce  Unified/MDCT stereo switching for 3ISM @96 kbps and 4ISM @128 kbps */

#define FIX_OMASA_BRSW                                  /* Nokia + VA: Fix missing init of OMASA metadata delay buffers, brsw-related init fixes */

#define FIX_356_ISM_METADATA_SYNC_OMASA

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_objectRenderer_internal.c

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,13 @@ ivas_error ivas_td_binaural_renderer( 
        ism_md_subframe_update = 2;

    }



#ifdef FIX_356_ISM_METADATA_SYNC_OMASA

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        ism_md_subframe_update = 0;

    }

#endif



    return ivas_td_binaural_renderer_unwrap(

        st_ivas->hReverb,

        st_ivas->transport_config,