Commit a8ff39cd authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2516-porting-error-in-renderer-custom-ls-output' into 'main' 

Resolve "Porting error in renderer custom LS output"

Closes #2516

See merge request !2932
parents db917629 69f4108f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define FIX_BASOP_2512_WRONG_SHIFT_IN_DIRAC_CONFIG      /* Nokia: BASOP 2512: Fix wrong division by shift */

#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */

#define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */

#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */



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

lib_rend/lib_rend_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4054,7 +4054,11 @@ static LSSETUP_CUSTOM_STRUCT makeCustomLsSetup( 
    move16();

    FOR( i = 0; i < rendCustomLsLayout.num_spk; ++i )

    {

#ifdef FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG

        IF( GT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) )

#else

        IF( LT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) )

#endif

        {

            customLs.is_planar_setup = 0;

            move16();