Commit 91089394 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_865_MOVE_TD_DECORR

parent 256528d9

lib_com/ivas_prot.h

+0 −38
Original line number Diff line number Diff line
@@ -3725,17 +3725,6 @@ void ivas_dirac_dec_render_sf( 
    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]

);



#ifndef FIX_865_MOVE_TD_DECORR

ivas_error ivas_td_decorr_reconfig_dec(

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

    const int32_t ivas_total_brate,                             /* i  : total IVAS bitrate                      */

    const int16_t nchan_transport,                              /* i  : number of transport channels            */

    const int32_t output_Fs,                                    /* i  : output sampling rate                    */

    ivas_td_decorr_state_t **hTdDecorr,                         /* i/o: TD decorrelator handle                  */

    uint16_t *useTdDecorr                                       /* i/o: TD decorrelator flag                    */

);



#endif

void computeDiffuseness_mdft(

    float **buffer_intensity[DIRAC_NUM_DIMS],

    const float *buffer_energy,
@@ -4668,33 +4657,6 @@ void ivas_td_decorr_get_ducking_gains( 
    const int16_t tdet_flag 

);



#ifndef FIX_865_MOVE_TD_DECORR

ivas_error ivas_td_decorr_dec_open(

    ivas_td_decorr_state_t **hTdDecorr,                         /* i/o: TD decorrelator handle                  */

    const int32_t output_Fs,                                    /* i  : output sampling rate                    */

    const int16_t nchan_internal,                               /* i  : number of internal channels             */

    const int16_t ducking_flag                                  /* i  : ducking flag                            */

);



void ivas_td_decorr_dec_close(

    ivas_td_decorr_state_t **hTdDecorr                          /* i/o: TD decorrelator handle                  */

);



void ivas_td_decorr_process( 

    ivas_td_decorr_state_t *hTdDecorr,                          /* i/o: SPAR Covar. decoder handle              */

    float *pcm_in[],                                            /* i  : input audio channels                    */

    float **ppOut_pcm,                                          /* o  : output audio channels                   */

    const int16_t output_frame                                  /* i  : output frame length                     */

);



void ivas_td_decorr_APD_iir_filter(

    ivas_td_decorr_APD_filt_state_t *filter_state,

    float *pIn_out,

    const int16_t num_APD_sections,

    const int16_t length

);



#endif

#define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \

    out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1);    \

    out1_im = ( in1_re * in2_im ) + ( in2_re * in1_im ); MAC(1); MULT(1);

lib_com/ivas_stat_com.h

+0 −30
Original line number Diff line number Diff line
@@ -672,36 +672,6 @@ typedef struct ivas_trans_det_state_t 
} ivas_trans_det_state_t;





#ifndef FIX_865_MOVE_TD_DECORR



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

 * Time domain decorrelator

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



typedef struct ivas_td_decorr_APD_filt_state_t

{

    int16_t order[IVAS_MAX_DECORR_APD_SECTIONS];

    int16_t idx[IVAS_MAX_DECORR_APD_SECTIONS];

    float coeffs[IVAS_MAX_DECORR_APD_SECTIONS];

    float *state[IVAS_MAX_DECORR_APD_SECTIONS];



} ivas_td_decorr_APD_filt_state_t;



typedef struct ivas_td_decorr_state_t

{

    ivas_trans_det_state_t *pTrans_det;

    float *look_ahead_buf;

    ivas_td_decorr_APD_filt_state_t APD_filt_state[IVAS_MAX_DECORR_CHS];



    int16_t num_apd_outputs;

    int16_t num_apd_sections;

    int16_t ducking_flag;



    int16_t offset;



} ivas_td_decorr_state_t;



#endif



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

 * Filter Bank (FB) structures

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_865_MOVE_TD_DECORR                          /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */

#define FIX_888_INTERFACE_UNIFICATION                   /* Nokia: issue #888: fix mismatch in 2D array size */

#define FIX_889_MASA_FILE_WRITER_OPEN                   /* Nokia: issue #889: mismatch in function definition and use */

#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

lib_rend/ivas_prot_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ void limiter_process( 
    int16_t *strong_saturation_cnt                              /* i/o: counter of strong saturations (can be NULL)                     */

);



#ifdef FIX_865_MOVE_TD_DECORR

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

 * TD decorr. function prototypes

 *----------------------------------------------------------------------------------*/
@@ -148,7 +147,6 @@ void ivas_td_decorr_APD_iir_filter( 
    const int16_t output_frame                                  /* i  : output frame length                                     */

);



#endif



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

 * Amplitude Panning EFAP prototypes

lib_rend/ivas_stat_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ typedef struct ivas_output_setup_structure 
} IVAS_OUTPUT_SETUP, *IVAS_OUTPUT_SETUP_HANDLE;





#ifdef FIX_865_MOVE_TD_DECORR

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

 * Time domain decorrelator structures

 *----------------------------------------------------------------------------------*/
@@ -100,7 +99,6 @@ typedef struct ivas_td_decorr_state_t 
    int16_t offset;



} ivas_td_decorr_state_t;

#endif





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