avcodec/metasound_data: Move data shared with twinvq into a new file

Namely into a header metasound_twinvq_data.h included
in twinvq.c (the common file of MetaSound and TwinVQ).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

libavcodec/Makefile

@@ -705,7 +705,7 @@ OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o
 OBJS-$(CONFIG_TTA_DECODER)             += tta.o ttadata.o ttadsp.o
 OBJS-$(CONFIG_TTA_ENCODER)             += ttaenc.o ttaencdsp.o ttadata.o
 OBJS-$(CONFIG_TTML_ENCODER)            += ttmlenc.o ass_split.o
-OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvqdec.o twinvq.o metasound_data.o
+OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvqdec.o twinvq.o
 OBJS-$(CONFIG_TXD_DECODER)             += txd.o
 OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
 OBJS-$(CONFIG_UTVIDEO_DECODER)         += utvideodec.o utvideodsp.o

libavcodec/metasound_data.h

@@ -27,12 +27,6 @@
 
 #include "twinvq.h"
 
-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[];
-
 extern const TwinVQModeTab ff_metasound_mode0806;
 extern const TwinVQModeTab ff_metasound_mode0806s;
 extern const TwinVQModeTab ff_metasound_mode0808;

libavcodec/twinvq.c

@@ -28,6 +28,7 @@
 #include "decode.h"
 #include "fft.h"
 #include "lsp.h"
+#include "metasound_twinvq_data.h"
 #include "sinewin.h"
 #include "twinvq.h"
 

libavcodec/twinvq.h

@@ -25,6 +25,7 @@
 #include <math.h>
 #include <stdint.h>
 
+#include "libavutil/attributes_internal.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
@@ -179,8 +180,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 +207,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 */

libavcodec/twinvqdec.c

@@ -27,7 +27,6 @@
 #include "codec_internal.h"
 #include "get_bits.h"
 #include "twinvq.h"
-#include "metasound_data.h"
 #include "twinvq_data.h"
 
 static const TwinVQModeTab mode_08_08 = {