From 361e89e80a0bd1c0128fdd2f0dc26ef2970ec5f9 Mon Sep 17 00:00:00 2001 From: Mikko-Ville Laitinen Date: Tue, 15 Aug 2023 09:01:54 +0300 Subject: [PATCH] Correct metadata update subframe for omasa jbm td rendering --- lib_dec/ivas_dec.c | 1 - lib_dec/ivas_dirac_dec.c | 1 - lib_dec/ivas_objectRenderer_internal.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index bd9c41cee2..b3482b0fed 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -560,7 +560,6 @@ ivas_error ivas_dec( } } #ifdef MASA_AND_OBJECTS - // Todo OMASA JBM: Check here for p_output vs. output and possibly also metadata indices else if ( st_ivas->ivas_format == MASA_ISM_FORMAT ) { int16_t nchan_ism, nchan_transport_ism; diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 711d286dce..d33f06765e 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -929,7 +929,6 @@ ivas_error ivas_dirac_dec_config( else { /* This is required to keep BE in rate switching. This probably means that 1TC and 2TC MASA perform differently. */ - /* TODO: refactor merge: does this need to be adapted for OMASA? */ #ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN if ( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params != NULL && !( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nSCE > 0 ) ) #else diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index d65b51ab76..c37210c9a7 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -192,7 +192,7 @@ ivas_error ivas_td_binaural_renderer_sf( #ifdef MASA_AND_OBJECTS if ( st_ivas->ivas_format == MASA_ISM_FORMAT ) { - ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 4 ); /* Todo Nokia: Update this value to match the value of nonJBM rendering. */ + ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 2 ); } #endif -- GitLab