Commit 941ca076 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into float-1539-decoder-format-switching-for-g-192-bitstreams
parents e4c2b005 6366bfab

apps/decoder.c

+4 −6
Original line number Diff line number Diff line
@@ -3420,6 +3420,8 @@ static ivas_error decodeVoIP( 


            *phIvasDec = hIvasDec; /* Update for main()' s free */

            ivasRtp.restartNeeded = false;

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

        }



        /* reference vector */
@@ -3668,6 +3670,8 @@ static ivas_error decodeVoIP( 
                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

                }



                /* Placeholder for memory reallocation */
@@ -4426,12 +4430,6 @@ static ivas_error restartDecoder( 
        }

    }



    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -161,14 +161,16 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#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_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */

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





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



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */



#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */





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

lib_enc/acelp_core_enc.c

+3 −0
Original line number Diff line number Diff line
@@ -371,6 +371,9 @@ ivas_error acelp_core_enc( 
        nb_bits = 0;

        st->acelp_cfg.FEC_mode = 0;

        uc_two_stage_flag = 0;

#ifdef FIX_1543_MID_LSF_BITS

        st->acelp_cfg.mid_lsf_bits = -1;

#endif



        if ( !nelp_mode && !ppp_mode )

        {

lib_enc/core_enc_2div.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ void core_encode_twodiv( 
    set_s( tnsSize, 0, 2 );

    set_s( tnsBits, 0, 2 );

    ltpBits = 0;

    no_param_lpc = 0;



    for ( i = 0; i < 3; i++ )

    {

lib_enc/ivas_masa_enc.c

+1 −24
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ static void masa_metadata_direction_alignment( MASA_ENCODER_HANDLE hMasa ); 
#define LOWBITRATE_ONSET_BETA  0.92f

#define LOWBITRATE_ONSET_GAIN  1.4f

#define LOWBITRATE_NUM_BANDS   5

#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

#define IMPORTANCE_MIN_STEP    0.000244140625f /* 2^-12 to match BASOP */

#endif





/*-----------------------------------------------------------------------*
@@ -984,11 +982,7 @@ static void combine_freqbands_and_subframes( 
    MASA_ENCODER_HANDLE hMasa )

{

    int16_t i, j, k, m;

#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

    volatile float aziRad, eleRad; /* Using volatile to reduce numerically unstable optimization */

#else

    float aziRad, eleRad;

#endif

    float x[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];

    float y[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];

    float z[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
@@ -1074,14 +1068,9 @@ static void combine_freqbands_and_subframes( 
                        energySum += hMasa->data.energy[j][m];

                    }



#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

                    /* Using atan2 instead of atan2f to reduce platform difference */

                    aziRad = (float) atan2( ySum, xSum );

                    eleRad = (float) atan2( zSum, sqrtf( xSum * xSum + ySum * ySum ) );

#else

                    aziRad = atan2f( ySum, xSum );

                    eleRad = atan2f( zSum, sqrtf( xSum * xSum + ySum * ySum ) );

#endif



                    hMeta->directional_meta[i].azimuth[j][k] = aziRad / EVS_PI * 180.0f;

                    hMeta->directional_meta[i].elevation[j][k] = eleRad / EVS_PI * 180.0f;
@@ -1189,13 +1178,8 @@ void ivas_masa_combine_directions( 
    uint8_t computeCoherence;

    MASA_METADATA_HANDLE hMeta;



#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

    volatile float aziRad; /* Using volatile to reduce numerically unstable optimization */

    volatile float eleRad;

#else

    float aziRad;

    float eleRad;

#endif

    float x[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];

    float y[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];

    float z[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
@@ -1265,13 +1249,11 @@ void ivas_masa_combine_directions( 
            }

            importance[i] /= (float) numSf;

            importance[i] *= hMasa->data.importanceWeight[i];

#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

            /* Setting close to zero values to zero to reduce decision differences */

            if ( importance[i] < IMPORTANCE_MIN_STEP )

            {

                importance[i] = 0.0f;

            }

#endif

        }



        /* Determine bands where to use two directions */
@@ -1295,14 +1277,9 @@ void ivas_masa_combine_directions( 
        {

            for ( j = 0; j < numSf; j++ )

            {

#ifdef FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE

                /* Using atan2 instead of atan2f to reduce platform difference */

                aziRad = (float) atan2( ySum[j][i], xSum[j][i] );

                eleRad = (float) atan2( zSum[j][i], sqrtf( xSum[j][i] * xSum[j][i] + ySum[j][i] * ySum[j][i] ) );

#else

                aziRad = atan2f( ySum[j][i], xSum[j][i] );

                eleRad = atan2f( zSum[j][i], sqrtf( xSum[j][i] * xSum[j][i] + ySum[j][i] * ySum[j][i] ) );

#endif



                hMeta->directional_meta[0].azimuth[j][i] = aziRad / EVS_PI * 180.0f;

                hMeta->directional_meta[0].elevation[j][i] = eleRad / EVS_PI * 180.0f;