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 */

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;
         }