Commit 492d38b5 authored by Gregory Pallone's avatar Gregory Pallone
Browse files

Merge branch 'main' into float-1548-Harmonize-non-diegetic-panning-law-in-ISM-and-renderer

parents f21b45a8 4cb9c948

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */

#define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN            /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */ 



/* #################### End BE switches ################################## */

lib_dec/ivas_svd_dec.c

+59 −0
Original line number Diff line number Diff line
@@ -272,7 +272,12 @@ static int16_t BidagonalDiagonalisation( 
)

{

    int16_t kCh, nCh, iCh, jCh, split;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    volatile float c, s;

    float f1, f2;

#else

    float c, s, f1, f2;

#endif

    float g = 0.0f;

    int16_t convergence, iteration, found_split;

    int16_t error = 0;
@@ -385,9 +390,14 @@ static void ApplyQRTransform( 
)

{

    int16_t ch, split;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    float d = 0.0f, g = 0.0f, r = 0.0f, x_ii = 0.0f, x_split = 0.0f, x_kk = 0.0f, aux = 0.0f;

    volatile float mu = 0.0f, c = 1.0f, s = 1.0f;

#else

    float d = 0.0f, g = 0.0f, r = 0.0f, x_ii = 0.0f, x_split = 0.0f, x_kk = 0.0f, mu = 0.0f, aux = 0.0f;

    float c = 1.0f;

    float s = 1.0f;

#endif



    x_kk = singularValues[currentIndex];

    x_ii = singularValues[startIndex];
@@ -525,10 +535,20 @@ static void biDiagonalReductionLeft( 
    float *g )

{

    int16_t iCh, jCh;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    volatile float norm_x, r;

    volatile float f;

    volatile float g_loc;

#else

    float norm_x, f, r;

#endif



    /* Setting values to 0 */

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    g_loc = 0.0f;

#else

    ( *g ) = 0.0f;

#endif



    if ( currChannel < nChannelsL ) /* i <= m */

    {
@@ -541,9 +561,15 @@ static void biDiagonalReductionLeft( 


        if ( ( norm_x ) ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */

        {

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

            g_loc = -( singularVectors[currChannel][currChannel] >= 0 ? 1 : ( -1 ) ) * sqrtf( norm_x );

            r = g_loc * singularVectors[currChannel][currChannel] - norm_x;

            singularVectors[currChannel][currChannel] = ( singularVectors[currChannel][currChannel] - g_loc );

#else

            ( *g ) = -( singularVectors[currChannel][currChannel] >= 0 ? 1 : ( -1 ) ) * sqrtf( norm_x );

            r = ( *g ) * singularVectors[currChannel][currChannel] - norm_x;

            singularVectors[currChannel][currChannel] = ( singularVectors[currChannel][currChannel] - ( *g ) );

#endif



            for ( iCh = currChannel + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC */

            {
@@ -564,6 +590,10 @@ static void biDiagonalReductionLeft( 
        }

    }



#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    *g = g_loc;

#endif



    return;

}
@@ -582,10 +612,19 @@ static void biDiagonalReductionRight( 
    float *g )

{

    int16_t iCh, jCh, idx;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    volatile float norm_x, r;

    volatile float g_loc;

#else

    float norm_x, r;

#endif



    /* Setting values to 0 */

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    g_loc = 0.0f;

#else

    ( *g ) = 0.0f;

#endif



    if ( currChannel < nChannelsL && currChannel != ( nChannelsC - 1 ) ) /* i <=m && i !=n */

    {
@@ -600,9 +639,15 @@ static void biDiagonalReductionRight( 


        if ( norm_x ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */

        {

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

            g_loc = -( singularVectors[currChannel][idx] >= 0 ? 1 : ( -1 ) ) * sqrtf( norm_x );

            r = g_loc * singularVectors[currChannel][idx] - norm_x;

            singularVectors[currChannel][idx] = ( singularVectors[currChannel][idx] - g_loc );

#else

            ( *g ) = -( singularVectors[currChannel][idx] >= 0 ? 1 : ( -1 ) ) * sqrtf( norm_x );

            r = ( *g ) * singularVectors[currChannel][idx] - norm_x;

            singularVectors[currChannel][idx] = ( singularVectors[currChannel][idx] - ( *g ) );

#endif



            for ( iCh = currChannel + 1; iCh < nChannelsL; iCh++ ) /*  nChannelsL */

            {
@@ -620,6 +665,10 @@ static void biDiagonalReductionRight( 
        }

    }



#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    *g = g_loc;

#endif



    return;

}
@@ -638,7 +687,12 @@ static void singularVectorsAccumulationLeft( 
{

    int16_t nCh, iCh, k;

    int16_t nChannels;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    float norm_y;

    volatile float t_jj, t_ii;

#else

    float norm_y, t_jj, t_ii;

#endif



    /* Processing */

    nChannels = min( nChannelsL, nChannelsC ); /* min(nChannelsL,ChannelsC) */
@@ -706,7 +760,12 @@ static void singularVectorsAccumulationRight( 
{

    int16_t nCh, iCh, k;

    int16_t nChannels;

#ifdef FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN

    float norm_y, t_ii;

    volatile float ratio;

#else

    float norm_y, t_ii, ratio;

#endif



    /* Processing */

    nChannels = nChannelsC; /* nChannelsC */

scripts/ivas_conformance/README.md

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ Analysing tests for ISAR (1252 tests) 


### Perform the MLD based non-BE analysis on the CUT outputs on reference platform (Ubuntu 24.04)



The MLD-based non-BE analysis is performed to the CUT outputs with the command below. Encoded outputs will be decoded using the reference decoder executables as part of the process. The MLD analysis is then performed between the CUT and reference decoded outputs (only ".wav" files are compared). Comparison to MLD corridor is also done as part of this process. An example passing output is shown below. If all test sets print `MLD Corridor passed for...` and there were no non-BE metadata comparisons in BE-test, then CUT outputs are Non-BE conformant.

The non-BE analysis below compares CUT and reference outputs by running MLD on audio (`.wav`) and, when MASA metadata are generated, for the matching reference/DUT `.met` files. For encoder tests, encoded CUT bitstreams are first decoded with the reference decoder before analysis. Per-frame MLD and MASA metadata values are written to `scripts/CUT_OUTPUTS` and checked against corridor references in `testvec/testv/mld_ref` (`mld_ref_<TAG>.csv` and `masa_ref_<TAG>.csv`).





```shell

PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --analyse

scripts/ivas_conformance/runConformance.py

+530 −81

File changed.

Preview size limit exceeded, changes collapsed.