From 8a2f9f8dd5a535100ebf828126a330364d2de36d Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 14 Aug 2025 10:55:49 +0200 Subject: [PATCH 1/2] port NONBE_1229_FIX_ISM1_DPID --- lib_com/options.h | 1 + lib_util/render_config_reader.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 27b6c8657..6cad54698 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -211,6 +211,7 @@ #define NONBE_1894_OSBA_SCALING /* FhG: port OSBA scaling MRs (298,355,360) jointly */ #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 ############################ */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index f9a8db697..2262b1940 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -3052,7 +3052,11 @@ ivas_error RenderConfigReader_getDirectivity( } } /* case when -dpid is not specified, select first directivity pattern from config file */ +#ifdef NONBE_1229_FIX_ISM1_DPID + if ( last_specified_id == 65535 ) +#else if ( n == 0 ) +#endif { last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id; } -- GitLab From 79712f9a4ca116af093770f785c2fed1fd396786 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 14 Aug 2025 11:10:40 +0200 Subject: [PATCH 2/2] dummy commit to trigger pipeline -- GitLab