diff --git a/lib_com/options.h b/lib_com/options.h index 27b6c86578e93b145e3067c5a89fb0879d6bd2fd..6cad54698e10e13a3d880d2ddf7c0a1be00eeff1 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 f9a8db6977921432afc7a513df17e82982ce2cb2..2262b1940abf36afd9779ae90468ef2693097bfc 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; }