From ac8502811c250eef89e55fd7d3a0b11750c29dbc Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Thu, 10 Aug 2023 09:54:02 +0300 Subject: [PATCH] Fix issue 634 by removing the unnecessary argument. --- lib_com/ivas_prot.h | 2 ++ lib_com/options.h | 1 + lib_dec/ivas_dirac_dec.c | 4 ++++ lib_dec/ivas_jbm_dec.c | 10 +++++++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 315970a6c2..2eca0b1904 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -843,7 +843,9 @@ int16_t ivas_jbm_dec_get_num_tc_channels( #ifdef FIX_470_MASA_JBM_EXT void ivas_jbm_dec_get_md_map_even_spacing( +#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER const int16_t default_len, /* i : default frame length in metadata slots */ +#endif const int16_t len, /* i : length of the modfied frames in metadata slots */ const int16_t subframe_len, /* i : default length of a subframe */ const int16_t offset, /* i : current read offset into the md buffer */ diff --git a/lib_com/options.h b/lib_com/options.h index 4b7274c878..e8d9d669dd 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -229,6 +229,7 @@ #define FIX_653_BUG_IN_SKIP_MATRIX /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/ #define FIX_663_PARAM_ISM_EXT /* FhG: Issue 663: ParamISM EXT output improvement */ #define FIX_673_OMASA_OBJ_MD_SYNC /* Nokia: Fix issue 673 by updating metadata in the third subframe to account for audio delay. */ +#define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 491d2f48b6..6adfbd0296 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -1579,7 +1579,11 @@ void ivas_dirac_dec_set_md_map( #ifdef FIX_470_MASA_JBM_EXT if ( st_ivas->ivas_format == MASA_FORMAT ) { +#ifdef FIX_634_MASA_JBM_UNUSED_PARAMETER + ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map ); +#else ivas_jbm_dec_get_md_map_even_spacing( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map ); +#endif } else if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 ) #else diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 276fdff4e3..2adbb5a25d 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1394,7 +1394,9 @@ void ivas_jbm_dec_get_md_map( * Get an meta data map adapted to a time scale modified IVAS frame. Distribute slots evenly across the modified frame. *--------------------------------------------------------------------------*/ void ivas_jbm_dec_get_md_map_even_spacing( - const int16_t default_len, /* i : default frame length in metadata slots */ +#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER + const int16_t default_len, /* i : default frame length in metadata slots */ +#endif const int16_t len, /* i : length of the modfied frames in metadata slots */ const int16_t subframe_len, /* i : default length of a subframe */ const int16_t offset, /* i : current read offset into the md buffer */ @@ -1405,8 +1407,10 @@ void ivas_jbm_dec_get_md_map_even_spacing( int16_t map_idx, sf_idx, sf_length, increment, subframes_written; float decimal, decimal_sum, eps; int16_t subframe_map_length[MAX_PARAM_SPATIAL_SUBFRAMES]; +#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER #ifdef DEBUGGING assert( default_len % 2 == 0 ); +#endif #endif /* subframe map length */ @@ -2167,7 +2171,11 @@ static void ivas_jbm_masa_sf_to_slot_map( num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES; /* Map input subframes to slots */ +#ifdef FIX_634_MASA_JBM_UNUSED_PARAMETER + ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, MAX_PARAM_SPATIAL_SUBFRAMES, sf_to_slot_map ); +#else ivas_jbm_dec_get_md_map_even_spacing( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, MAX_PARAM_SPATIAL_SUBFRAMES, sf_to_slot_map ); +#endif for ( slot_idx = 0; slot_idx < nCldfbTs; slot_idx++ ) { -- GitLab