Commit e1074af2 authored by multrus's avatar multrus
Browse files

Merge branch '1653_ref_portFlp1575' into 'ivas-float-update' 

Port float MR1575 to ivas-float-update

See merge request !2046
parents 626e18b7 8f2b5c79

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -3085,7 +3085,11 @@ void mctStereoIGF_enc( 
    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */

    Encoder_State **sts,                                        /* i/o: encoder state structure                 */

    float *orig_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i  : MDCT spectrum for ITF                   */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float *powerSpec[MCT_MAX_CHANNELS],                         /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#else

    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#endif

    float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],            /* i  : same as above but for inverse spect.    */

    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i  : inverse spectrum                        */

    const int16_t sp_aud_decision0[MCT_MAX_CHANNELS]            /* i  : speech audio decision                   */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

lib_enc/ivas_mct_core_enc.c

+36 −0
Original line number Diff line number Diff line
@@ -197,13 +197,27 @@ void ivas_mct_core_enc( 
    int16_t i, cpe_id, n, nAvailBits;

    int16_t nCPE;

    float *orig_spectrum[MCT_MAX_CHANNELS][2]; /* Pointers to MDCT output for a short block (L/R) */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float powerSpecMsInv_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];

    float inv_spectrum_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];

    float powerSpec_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];

    float powerSpec_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k];

    float inv_spectrum_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k];   /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */

    float powerSpecMsInv_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k]; /* MS inv power spectrum, also inverse MDST spectrum */

#else

    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k];

    float powerSpecMsInv_long[MCT_MAX_CHANNELS][L_FRAME48k]; /* MS inv power spectrum, also inverse MDST spectrum */

#endif

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float *powerSpec[MCT_MAX_CHANNELS];

#endif

    float *powerSpecMsInv[MCT_MAX_CHANNELS][2];

    float *inv_mdst_spectrum[MCT_MAX_CHANNELS][2];

    float *inv_spectrum[MCT_MAX_CHANNELS][2];

    float *mdst_spectrum[MCT_MAX_CHANNELS][2];

#ifndef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float inv_spectrum_long[MCT_MAX_CHANNELS][L_FRAME48k]; /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */

#endif

    int16_t total_side_bits;

    int16_t chBitRatios[MCT_MAX_CHANNELS];

    Encoder_State *sts[MCT_MAX_CHANNELS];
@@ -238,12 +252,34 @@ void ivas_mct_core_enc( 
        nCPE++;

    }



#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    /* point first CPE channels to longer buffers where switching from ACELP to TCX may occur in SBA with DTX (total memory saving)*/

    for ( ch = 0; ch < CPE_CHANNELS; ch++ )

    {

        inv_mdst_spectrum[ch][0] = powerSpecMsInv[ch][0] = powerSpecMsInv_long_cpe0[ch];

        inv_mdst_spectrum[ch][1] = powerSpecMsInv[ch][1] = powerSpecMsInv_long_cpe0[ch] + N_TCX10_MAX;

        inv_spectrum[ch][0] = inv_spectrum_long_cpe0[ch];

        inv_spectrum[ch][1] = inv_spectrum_long_cpe0[ch] + N_TCX10_MAX;

        powerSpec[ch] = powerSpec_long_cpe0[ch];

    }



    for ( ch = CPE_CHANNELS; ch < nChannels; ch++ )

#else

    for ( ch = 0; ch < nChannels; ch++ )

#endif

    {

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

        inv_mdst_spectrum[ch][0] = powerSpecMsInv[ch][0] = powerSpecMsInv_long[ch - CPE_CHANNELS];

        inv_mdst_spectrum[ch][1] = powerSpecMsInv[ch][1] = powerSpecMsInv_long[ch - CPE_CHANNELS] + N_TCX10_MAX;

        inv_spectrum[ch][0] = inv_spectrum_long[ch - CPE_CHANNELS];

        inv_spectrum[ch][1] = inv_spectrum_long[ch - CPE_CHANNELS] + N_TCX10_MAX;

        powerSpec[ch] = powerSpec_long[ch - CPE_CHANNELS];

#else

        inv_mdst_spectrum[ch][0] = powerSpecMsInv[ch][0] = powerSpecMsInv_long[ch];

        inv_mdst_spectrum[ch][1] = powerSpecMsInv[ch][1] = powerSpecMsInv_long[ch] + N_TCX10_MAX;

        inv_spectrum[ch][0] = inv_spectrum_long[ch];

        inv_spectrum[ch][1] = inv_spectrum_long[ch] + N_TCX10_MAX;

#endif

    }



    for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )

lib_enc/ivas_mct_enc_mct.c

+8 −4
Original line number Diff line number Diff line
@@ -817,7 +817,11 @@ void mctStereoIGF_enc( 
    MCT_ENC_HANDLE hMCT,                       /* i/o: MCT encoder structure               */

    Encoder_State **sts,                       /* i/o: encoder state structure             */

    float *orig_spectrum[MCT_MAX_CHANNELS][2], /* i  : MDCT spectrum for ITF               */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float *powerSpec[MCT_MAX_CHANNELS], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/

#else

    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/

#endif

    float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/

    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */

    const int16_t sp_aud_decision0[MCT_MAX_CHANNELS] /* i  : speech audio decision               */