Commit 8435dd9f authored by kinuthia's avatar kinuthia
Browse files

Merge branch '1912_ref_mr1872-from-float' into 'ivas-float-update' 

[Non-BE] Resolve "Port mr1872 from float" to ivas-float-update

See merge request !2079
parents 4b2b7e85 79712f9a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ############################ */

lib_util/render_config_reader.c

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

        }