From 3905170916ed681af35a97d7eb01581d7350b2c1 Mon Sep 17 00:00:00 2001 From: Vidhya V P <100825@ittiam.com> Date: Mon, 7 Aug 2023 19:51:09 +0530 Subject: [PATCH 1/2] Resolving issue #653 --- lib_com/options.h | 2 +- lib_dec/ivas_spar_decoder.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 07d9d40355..b6797690d1 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -217,7 +217,7 @@ #define FIX_613_DIRAC_NULL_PTR_USAN /* Nokia: Issue #613: USAN in DirAC decoder setup */ #define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */ - +#define FIX_653_BUG_IN_SKIP_MATRIX /* Dlb: fix issue #653, bug in the ivas_spar_get_skip_mat function*/ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 5712d9d603..5f8a65e7ac 100755 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -984,7 +984,11 @@ static void ivas_spar_get_skip_mat( { for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) { +#ifndef FIX_653_BUG_IN_SKIP_MATRIX if ( hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * MAX_PARAM_SPATIAL_SUBFRAMES] != 0.0f ) +#else + if ( hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * IVAS_MAX_NUM_BANDS] != 0.0f ) +#endif { skip_flag = 0; break; -- GitLab From 87288aa3a0fc23c18fed85212227cad1b39a711d Mon Sep 17 00:00:00 2001 From: rtyag Date: Tue, 8 Aug 2023 10:54:42 +1000 Subject: [PATCH 2/2] dummy comment change in options.h --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index b6797690d1..4156782ca3 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -217,7 +217,7 @@ #define FIX_613_DIRAC_NULL_PTR_USAN /* Nokia: Issue #613: USAN in DirAC decoder setup */ #define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */ -#define FIX_653_BUG_IN_SKIP_MATRIX /* Dlb: fix issue #653, bug in the ivas_spar_get_skip_mat function*/ +#define FIX_653_BUG_IN_SKIP_MATRIX /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/ /* ################## End BE DEVELOPMENT switches ######################### */ -- GitLab