From 93c0cf82a34ee8691593e9d0c6251e185e25a426 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 14 Aug 2025 11:04:34 +0200 Subject: [PATCH 1/2] port NONBE_1229_FIX_ISM1_DPID basop --- lib_com/options.h | 2 ++ lib_util/render_config_reader.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 9ef650e07..596d127d3 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -139,6 +139,8 @@ #define NONBE_1894_OSBA_SCALING /* FhG: do not scale OSBA inputs by 0.5 any more */ #define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/ +#define NONBE_1229_FIX_ISM1_DPID /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */ + /* #################### End BASOP porting switches ############################ */ #define FIX_1766_TCX2ACELP_BWE_ISSUE /* VA : Fix rare BWE issue when switching from TCX to ACELP */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index ff2da6484..304190f07 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2940,7 +2940,12 @@ ivas_error RenderConfigReader_getDirectivity( } } /* case when -dpid is not specified, select first directivity pattern from config file */ +#ifdef NONBE_1229_FIX_ISM1_DPID + move16(); + if ( last_specified_id == 65535 ) +#else if ( n == 0 ) +#endif { last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id; } -- GitLab From d25b3a0c48dae05d9037777ab096cfef030dde75 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 14 Aug 2025 12:00:11 +0200 Subject: [PATCH 2/2] dummy commit to trigger pipeline again -- GitLab