Commit 73c9d62c authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_1594_TDM_LAST_RATIO

parent 756fc249

lib_com/ivas_prot.h

+0 −3
Original line number Diff line number Diff line
@@ -2950,9 +2950,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
#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_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

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

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */



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

lib_enc/ivas_cpe_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ 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                              */
@@ -135,9 +132,6 @@ 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 )

    {
@@ -208,11 +202,7 @@ 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

+0 −9
Original line number Diff line number Diff line
@@ -221,9 +221,6 @@ 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  */

)
@@ -239,12 +236,6 @@ 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 );