Commit 997961ba authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1229_FIX_ISM1_DPID

parent c20e4f8e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */



/* ##################### End NON-BE switches ########################### */

lib_util/render_config_reader.c

+0 −4
Original line number Diff line number Diff line
@@ -3034,11 +3034,7 @@ 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;

        }