Commit 826979aa authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of... 

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 500-head-tracking-api-causes-extra-15ms-of-delay
parents 4ba26372 ca04c29f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_REND_DELAY_COMP                             /* FhG: fix delay compensation in renderer.c - Doesn't affect BE as the broken code was never executed on main */

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK

#define FIX_CQMFPREDDEC_FREE                            /* FhG: avoid double free / free of NULL in DeletePredictionDecoder() */

#define FIX_PLANAR_SBA_JBM_RS

/* ### API_5MS switches ### */

lib_dec/ivas_jbm_dec.c

+10 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,16 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        }

        if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) )

            if (

#ifndef FIX_PLANAR_SBA_JBM_RS 

            ( st_ivas->sba_planar && num_tc >= 3 ) || 

            (

#endif

             num_tc == 3 

#ifndef FIX_PLANAR_SBA_JBM_RS 

             )

#endif

              )

            {

                num_tc++;

            }