Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / dca_core.h

diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h
index 10128d1..347566d 100644 (file)
--- a/libavcodec/dca_core.h
+++ b/libavcodec/dca_core.h
@@ -21,13 +21,12 @@
 #ifndef AVCODEC_DCA_CORE_H
 #define AVCODEC_DCA_CORE_H
 
-#include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/fixed_dsp.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
+#include "libavutil/tx.h"
 
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "dca.h"
 #include "dca_exss.h"
@@ -35,7 +34,6 @@
 #include "dcadct.h"
 #include "dcamath.h"
 #include "dcahuff.h"
-#include "fft.h"
 #include "synth_filter.h"
 
 #define DCA_CHANNELS            7
@@ -192,7 +190,8 @@ typedef struct DCACoreDecoder {
     DCADSPData              dcadsp_data[DCA_CHANNELS];    ///< FIR history buffers
     DCADSPContext           *dcadsp;
     DCADCTContext           dcadct;
-    FFTContext              imdct[2];
+    AVTXContext            *imdct[2];
+    av_tx_fn                imdct_fn[2];
     SynthFilterContext      synth;
     AVFloatDSPContext       *float_dsp;
     AVFixedDSPContext       *fixed_dsp;
@@ -247,8 +246,8 @@ static inline void ff_dca_core_dequantize(int32_t *output, const int32_t *input,
     }
 }
 
-int ff_dca_core_parse(DCACoreDecoder *s, uint8_t *data, int size);
-int ff_dca_core_parse_exss(DCACoreDecoder *s, uint8_t *data, DCAExssAsset *asset);
+int ff_dca_core_parse(DCACoreDecoder *s, const uint8_t *data, int size);
+int ff_dca_core_parse_exss(DCACoreDecoder *s, const uint8_t *data, DCAExssAsset *asset);
 int ff_dca_core_filter_fixed(DCACoreDecoder *s, int x96_synth);
 int ff_dca_core_filter_frame(DCACoreDecoder *s, AVFrame *frame);
 av_cold void ff_dca_core_flush(DCACoreDecoder *s);