Commit 68e28ee5 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '2636-mismatch-between-implementations-in-function-ivas_interformat_brate_fx' into 'main'

[non-BE] Resolve "Mismatch between implementations in function ivas_interformat_brate_fx()"

Closes #2636

See merge request !3084
parents 99dc937f e5329b09

lib_com/ivas_omasa_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -349,7 +349,11 @@ Word32 ivas_interformat_brate_fx( 


    limit_high = IVAS_512k / FRAMES_PER_SEC;

    move16();

#ifdef FIX_2636_OMASA_INTERFORMAT_BRATE

    IF( LT_32( element_brate, SCE_CORE_16k_LOW_LIMIT ) )

#else

    IF( LE_32( element_brate, SCE_CORE_16k_LOW_LIMIT ) )

#endif

    {

        limit_high = ACELP_12k8_HIGH_LIMIT / FRAMES_PER_SEC;

        move16();

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 
#define FIX_BASOP_2635_EFAP_ADD_VERTEX_ELE_ROUND        /* FhG: BASOP #2635: round |elevation| with anint_fx before the 90deg subtraction in add_vertex_fx */

#define FIX_BASOP_2639_INCORRECT_ARRAY_INDEX            /* Dolby: BASOP #2639: incorrect array index in ivas_spar_unquant_dtx_indicies */

#define FIX_BASOP_2640_MASA_STEREO_TYPE_ASSERT          /* Nokia: BASOP issue 2640: Fix assert by saturating shift when exponent difference is very large. */

#define FIX_2636_OMASA_INTERFORMAT_BRATE                /* VA: basop issue 2636: Correct condition in function ivas_interformat_brate_fx() */



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