Commit 2e086d5d authored by vaclav's avatar vaclav
Browse files

Removal of unused functions; under NONBE_UNIFIED_DECODING_PATHS_FIX

parent a45dfde0
Loading
Loading
Loading
Loading
Loading
+15 −6
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ const int16_t MC_PARAMUPMIX_CHIDX2[MC_PARAMUPMIX_COMBINATIONS] = { 2, 3, 6, 7 };
 * Local function prototypes
 *-----------------------------------------------------------------------*/

#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
static void ps_pred_process( MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, float qmf_mod_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_mod_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_side_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_side_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const int16_t ch );

#endif
static void ps_pred_process_sf( MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, DECODER_TC_BUFFER_HANDLE hTcBuffer, float qmf_mod_re[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_mod_im[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_side_re[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_side_im[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float *param_interpol, const int16_t ch, const int16_t slots_rendered );

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -76,8 +77,9 @@ static void ivas_mc_paramupmix_dec_sf( Decoder_Struct *st_ivas, float *output_f[

static void ivas_param_upmix_dec_decorr_subframes( Decoder_Struct *st_ivas, const int16_t nSamplesForRendering );

#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
static void paramupmix_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr[], float *pcm_in[], float **pp_out_pcm, const int16_t output_frame );

#endif
static int16_t huff_read( Decoder_State *st, const int16_t ( *ht )[2] );

static void huffman_decode( Decoder_State *st, const int16_t nv, const int16_t ivStart, PAR_TYPE parType, QUANT_TYPE quant_type, const int16_t bNoDt, int32_t *vq );
@@ -774,7 +776,7 @@ void ivas_mc_paramupmix_dec_close(


/*-------------------------------------------------------------------------
 * ivas_param_upmix_dec_decorr_subframes()
 * paramupmix_td_decorr_process_jbm()
 *
 *
 *------------------------------------------------------------------------*/
@@ -826,6 +828,12 @@ static void paramupmix_td_decorr_process_jbm(
}


/*-------------------------------------------------------------------------
 * ivas_param_upmix_dec_decorr_subframes()
 *
 *
 *------------------------------------------------------------------------*/

static void ivas_param_upmix_dec_decorr_subframes(
    Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle    */
    const int16_t nSamplesForRendering )
@@ -874,7 +882,7 @@ static void ivas_param_upmix_dec_decorr_subframes(
/*****************************************************************************************/
/* local functions                                                                       */
/*****************************************************************************************/

#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
static void ps_pred_process(
    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix,
    float qmf_mod_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* in/out */
@@ -937,6 +945,7 @@ static void ps_pred_process(

    return;
}
#endif

static void ps_pred_process_sf(
    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix,
@@ -1271,7 +1280,7 @@ static void ivas_mc_paramupmix_dec_sf(
    return;
}


#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
static void paramupmix_td_decorr_process(
    ivas_td_decorr_state_t *hTdDecorr[], /* i/o: SPAR Covar. decoder handle   */
    float *pcm_in[],                     /* i  : input audio channels         */
@@ -1317,7 +1326,7 @@ static void paramupmix_td_decorr_process(

    return;
}

#endif

static int16_t huff_read(
    Decoder_State *st,