Imported Upstream version 6.1

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

diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h
index b3c881c..84f4e51 100644 (file)
--- a/libavcodec/twinvq.h
+++ b/libavcodec/twinvq.h
@@ -25,10 +25,11 @@
 #include <math.h>
 #include <stdint.h>
 
+#include "libavutil/attributes_internal.h"
+#include "libavutil/tx.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "fft.h"
 
 enum TwinVQCodec {
     TWINVQ_CODEC_VQF,
@@ -136,7 +137,8 @@ typedef struct TwinVQModeTab {
 typedef struct TwinVQContext {
     AVCodecContext *avctx;
     AVFloatDSPContext *fdsp;
-    FFTContext mdct_ctx[3];
+    AVTXContext *tx[3];
+    av_tx_fn tx_fn[3];
 
     const TwinVQModeTab *mtab;
 
@@ -179,8 +181,15 @@ typedef struct TwinVQContext {
                        const float *shape, float *speech);
 } TwinVQContext;
 
+FF_VISIBILITY_PUSH_HIDDEN
 extern const enum TwinVQFrameType ff_twinvq_wtype_to_ftype_table[];
 
+extern const float ff_metasound_lsp8[];
+extern const float ff_metasound_lsp11[];
+extern const float ff_metasound_lsp16[];
+extern const float ff_metasound_lsp22[];
+extern const float ff_metasound_lsp44[];
+
 /** @note not speed critical, hence not optimized */
 static inline void twinvq_memset_float(float *buf, float val, int size)
 {
@@ -199,5 +208,6 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, AVFrame *frame,
 int ff_twinvq_decode_close(AVCodecContext *avctx);
 /** Requires the caller to call ff_twinvq_decode_close() upon failure. */
 int ff_twinvq_decode_init(AVCodecContext *avctx);
+FF_VISIBILITY_POP_HIDDEN
 
 #endif /* AVCODEC_TWINVQ_H */