Commit 2716268b authored by vaclav's avatar vaclav
Browse files

Merge branch '1594_tdm_last_ratio' into 'main' 

FIX_1594_TDM_LAST_RATIO

See merge request !2631
parents 6db0830c 23a2fe71

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2950,7 +2950,9 @@ ivas_error stereo_memory_enc( 
    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */

    const int16_t max_bwidth,                                   /* i  : maximum audio bandwidth                 */

#ifndef FIX_1594_TDM_LAST_RATIO

    float *tdm_last_ratio,                                      /* o  : TD stereo last ratio                    */

#endif

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t nchan_transport                               /* i  : number transport chans                  */

);

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1594_TDM_LAST_RATIO                         /* VA: float issue 1594: remove obsolete argument 'tdm_last_ratio' from stereo_memory_enc () */



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

lib_enc/ivas_cpe_enc.c

+15 −8
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ ivas_error ivas_cpe_enc( 
    float fft_buff[CPE_CHANNELS][2 * L_FFT];                                 /* FFT buffer                               */

    int16_t tdm_ratio_idx, tdm_ratio_idx_SM;                                 /* temp. TD stereo parameters               */

    int16_t tdm_SM_or_LRTD_Pri;                                              /* temp. TD stereo parameters               */

#ifndef FIX_1594_TDM_LAST_RATIO

    float tdm_last_ratio; /* temp. TD stereo parameters               */

#endif

    int16_t nb_bits;                            /* number of DFT stereo side bits           */

    float fr_bands[CPE_CHANNELS][2 * NB_BANDS]; /* energy in frequency bands                 */

    float Etot_LR[CPE_CHANNELS];                /* total energy                              */
@@ -133,8 +135,9 @@ ivas_error ivas_cpe_enc( 
    tdm_SM_or_LRTD_Pri = 0;

    tdm_ratio_idx = -1;

    tdm_ratio_idx_SM = -1;

#ifndef FIX_1594_TDM_LAST_RATIO

    tdm_last_ratio = 0;



#endif

#ifdef DEBUGGING

    if ( hCPE->hCoreCoder[0]->ini_frame == 0 )

    {
@@ -205,7 +208,11 @@ ivas_error ivas_cpe_enc( 
     * dynamically allocate data structures depending on the actual stereo mode

     *----------------------------------------------------------------*/



#ifdef FIX_1594_TDM_LAST_RATIO

    if ( ( error = stereo_memory_enc( hCPE, input_Fs, max_bwidth, ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )

#else

    if ( ( error = stereo_memory_enc( hCPE, input_Fs, max_bwidth, &tdm_last_ratio, ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )

#endif

    {

        return error;

    }

lib_enc/ivas_stereo_switching_enc.c

+8 −5
Original line number Diff line number Diff line
@@ -221,7 +221,9 @@ ivas_error stereo_memory_enc( 
    CPE_ENC_HANDLE hCPE,      /* i  : CPE encoder structure   */

    const int32_t input_Fs,   /* i  : input sampling rate     */

    const int16_t max_bwidth, /* i  : maximum audio bandwidth */

#ifndef FIX_1594_TDM_LAST_RATIO

    float *tdm_last_ratio, /* o  : TD stereo last ratio    */

#endif

    const IVAS_FORMAT ivas_format, /* i  : ivas format             */

    const int16_t nchan_transport  /* i  : number transport chans  */

)
@@ -237,11 +239,12 @@ ivas_error stereo_memory_enc( 
     * save parameters from structures that will be freed

     *---------------------------------------------------------------*/



#ifndef FIX_1594_TDM_LAST_RATIO

    if ( hCPE->last_element_mode == IVAS_CPE_TD )

    {

        *tdm_last_ratio = hCPE->hStereoTD->tdm_last_ratio; /* note: this must be set to local variable before data structures are allocated/deallocated */

    }



#endif

    if ( hCPE->hStereoTCA != NULL && hCPE->last_element_mode == IVAS_CPE_DFT )

    {

        set_s( hCPE->hStereoTCA->prevCorrLagStats, (int16_t) hCPE->hStereoDft->hItd->itd[1], 3 );