lavc/opus*: move to opus/ subdir

31 files changed, 100 insertions, 71 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c60c31b270..75ae377bf5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -66,6 +66,7 @@ OBJS = ac3_parser.o                                                     \
 # subsystems
 include $(SRC_PATH)/libavcodec/aac/Makefile
 include $(SRC_PATH)/libavcodec/hevc/Makefile
+include $(SRC_PATH)/libavcodec/opus/Makefile
 include $(SRC_PATH)/libavcodec/vvc/Makefile
 -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
 OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
@@ -580,11 +581,7 @@ OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
 OBJS-$(CONFIG_NOTCHLC_DECODER)         += notchlc.o
 OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o jpegquanttables.o
 OBJS-$(CONFIG_ON2AVC_DECODER)          += on2avc.o on2avcdata.o
-OBJS-$(CONFIG_OPUS_DECODER)            += opusdec.o opusdec_celt.o opus_celt.o \
-                                          opus_pvq.o opus_silk.o opustab.o vorbis_data.o \
-                                          opusdsp.o opus_parse.o opus_rc.o
-OBJS-$(CONFIG_OPUS_ENCODER)            += opusenc.o opusenc_psy.o opus_celt.o \
-                                          opus_pvq.o opus_rc.o opustab.o
+OBJS-$(CONFIG_OPUS_DECODER)            += vorbis_data.o
 OBJS-$(CONFIG_OSQ_DECODER)             += osq.o
 OBJS-$(CONFIG_PAF_AUDIO_DECODER)       += pafaudio.o
 OBJS-$(CONFIG_PAF_VIDEO_DECODER)       += pafvideo.o
@@ -1217,8 +1214,7 @@ OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \
 OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o
 OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
                                           mpeg12.o mpeg12data.o
-OBJS-$(CONFIG_OPUS_PARSER)             += opus_parser.o opus_parse.o \
-                                          vorbis_data.o
+OBJS-$(CONFIG_OPUS_PARSER)             += vorbis_data.o
 OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
 OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
 OBJS-$(CONFIG_QOI_PARSER)              += qoi_parser.o
diff --git a/libavcodec/aarch64/opusdsp_init.c b/libavcodec/aarch64/opusdsp_init.c
index a727006593..5452ea6240 100644
--- a/libavcodec/aarch64/opusdsp_init.c
+++ b/libavcodec/aarch64/opusdsp_init.c
@@ -20,7 +20,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/aarch64/cpu.h"
-#include "libavcodec/opusdsp.h"
+#include "libavcodec/opus/dsp.h"
 
 void ff_opus_postfilter_neon(float *data, int period, float *gains, int len);
 float ff_opus_deemphasis_neon(float *out, float *in, float coeff, const float *weights, int len);
diff --git a/libavcodec/opus/Makefile b/libavcodec/opus/Makefile
new file mode 100644
index 0000000000..53cb98e28d
--- /dev/null
+++ b/libavcodec/opus/Makefile
@@ -0,0 +1,30 @@
+clean::
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/opus/%)
+
+OBJS-$(CONFIG_OPUS_DECODER) +=  \
+    opus/dec.o                  \
+    opus/dec_celt.o             \
+    opus/celt.o                 \
+    opus/pvq.o                  \
+    opus/silk.o                 \
+    opus/tab.o                  \
+    opus/dsp.o                  \
+    opus/parse.o                \
+    opus/rc.o                   \
+
+
+OBJS-$(CONFIG_OPUS_PARSER) +=   \
+    opus/parser.o               \
+    opus/parse.o                \
+
+
+OBJS-$(CONFIG_OPUS_ENCODER) +=  \
+    opus/enc.o                  \
+    opus/enc_psy.o              \
+    opus/celt.o                 \
+    opus/pvq.o                  \
+    opus/rc.o                   \
+    opus/tab.o                  \
+
+
+libavcodec/opus/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/
diff --git a/libavcodec/opus_celt.c b/libavcodec/opus/celt.c
index a24c38be52..3b9c633702 100644
--- a/libavcodec/opus_celt.c
+++ b/libavcodec/opus/celt.c
@@ -21,9 +21,9 @@
 
 #include <stdint.h>
 
-#include "opus_celt.h"
-#include "opus_pvq.h"
-#include "opustab.h"
+#include "celt.h"
+#include "pvq.h"
+#include "tab.h"
 
 void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc)
 {
diff --git a/libavcodec/opus_celt.h b/libavcodec/opus/celt.h
index 2dbb79be6c..e957f2c123 100644
--- a/libavcodec/opus_celt.h
+++ b/libavcodec/opus/celt.h
@@ -26,9 +26,10 @@
 
 #include <stdint.h>
 
-#include "avcodec.h"
-#include "opusdsp.h"
-#include "opus_rc.h"
+#include "libavcodec/avcodec.h"
+
+#include "dsp.h"
+#include "rc.h"
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
diff --git a/libavcodec/opusdec.c b/libavcodec/opus/dec.c
index 81653b5bd0..6c59dc1f46 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opus/dec.c
@@ -51,11 +51,11 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "opus.h"
-#include "opustab.h"
-#include "opus_celt.h"
-#include "opus_parse.h"
-#include "opus_rc.h"
-#include "opus_silk.h"
+#include "tab.h"
+#include "celt.h"
+#include "parse.h"
+#include "rc.h"
+#include "silk.h"
 
 static const uint16_t silk_frame_duration_ms[16] = {
     10, 20, 40, 60,
diff --git a/libavcodec/opusdec_celt.c b/libavcodec/opus/dec_celt.c
index b19342337d..3feb4a4e47 100644
--- a/libavcodec/opusdec_celt.c
+++ b/libavcodec/opus/dec_celt.c
@@ -28,9 +28,9 @@
 #include <float.h>
 
 #include "libavutil/mem.h"
-#include "opus_celt.h"
-#include "opustab.h"
-#include "opus_pvq.h"
+#include "celt.h"
+#include "tab.h"
+#include "pvq.h"
 
 /* Use the 2D z-transform to apply prediction in both the time domain (alpha)
  * and the frequency domain (beta) */
diff --git a/libavcodec/opusdsp.c b/libavcodec/opus/dsp.c
index e61cc36098..6cd76ceceb 100644
--- a/libavcodec/opusdsp.c
+++ b/libavcodec/opus/dsp.c
@@ -19,7 +19,7 @@
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/mem_internal.h"
-#include "opusdsp.h"
+#include "dsp.h"
 
 static void postfilter_c(float *data, int period, float *gains, int len)
 {
diff --git a/libavcodec/opusdsp.h b/libavcodec/opus/dsp.h
index 9d93336cfe..2179ee6953 100644
--- a/libavcodec/opusdsp.h
+++ b/libavcodec/opus/dsp.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUSDSP_H
-#define AVCODEC_OPUSDSP_H
+#ifndef AVCODEC_OPUS_DSP_H
+#define AVCODEC_OPUS_DSP_H
 
 typedef struct OpusDSP {
     void (*postfilter)(float *data, int period, float *gains, int len);
@@ -30,4 +30,4 @@ void ff_opus_dsp_init_x86(OpusDSP *ctx);
 void ff_opus_dsp_init_aarch64(OpusDSP *ctx);
 void ff_opus_dsp_init_riscv(OpusDSP *ctx);
 
-#endif /* AVCODEC_OPUSDSP_H */
+#endif /* AVCODEC_OPUS_DSP_H */
diff --git a/libavcodec/opusenc.c b/libavcodec/opus/enc.c
index 0e4c3752a5..5398263119 100644
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opus/enc.c
@@ -22,10 +22,10 @@
 #include <float.h>
 
 #include "encode.h"
-#include "opusenc.h"
-#include "opus_pvq.h"
-#include "opusenc_psy.h"
-#include "opustab.h"
+#include "enc.h"
+#include "pvq.h"
+#include "enc_psy.h"
+#include "tab.h"
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
diff --git a/libavcodec/opusenc.h b/libavcodec/opus/enc.h
index 4d691d6a7d..d56f91e625 100644
--- a/libavcodec/opusenc.h
+++ b/libavcodec/opus/enc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUSENC_H
-#define AVCODEC_OPUSENC_H
+#ifndef AVCODEC_OPUS_ENC_H
+#define AVCODEC_OPUS_ENC_H
 
 #include "libavutil/intmath.h"
 #include "opus.h"
@@ -52,4 +52,4 @@ typedef struct OpusPacketInfo {
     int frames;
 } OpusPacketInfo;
 
-#endif /* AVCODEC_OPUSENC_H */
+#endif /* AVCODEC_OPUS_ENC_H */
diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opus/enc_psy.c
index 44a61e6939..250cfb567a 100644
--- a/libavcodec/opusenc_psy.c
+++ b/libavcodec/opus/enc_psy.c
@@ -22,10 +22,10 @@
 #include <float.h>
 
 #include "libavutil/mem.h"
-#include "opusenc_psy.h"
-#include "opus_celt.h"
-#include "opus_pvq.h"
-#include "opustab.h"
+#include "enc_psy.h"
+#include "celt.h"
+#include "pvq.h"
+#include "tab.h"
 #include "libavfilter/window_func.h"
 
 static float pvq_band_cost(CeltPVQ *pvq, CeltFrame *f, OpusRangeCoder *rc, int band,
diff --git a/libavcodec/opusenc_psy.h b/libavcodec/opus/enc_psy.h
index bc1a88c03d..569a33c03f 100644
--- a/libavcodec/opusenc_psy.h
+++ b/libavcodec/opus/enc_psy.h
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUSENC_PSY_H
-#define AVCODEC_OPUSENC_PSY_H
+#ifndef AVCODEC_OPUS_ENC_PSY_H
+#define AVCODEC_OPUS_ENC_PSY_H
 
 #include "libavutil/tx.h"
 #include "libavutil/mem_internal.h"
 
-#include "opusenc.h"
-#include "opus_celt.h"
-#include "opusenc_utils.h"
+#include "enc.h"
+#include "celt.h"
+#include "enc_utils.h"
 
 /* Each step is 2.5ms */
 typedef struct OpusPsyStep {
@@ -94,4 +94,4 @@ int  ff_opus_psy_init(OpusPsyContext *s, AVCodecContext *avctx,
 void ff_opus_psy_signal_eof(OpusPsyContext *s);
 int  ff_opus_psy_end(OpusPsyContext *s);
 
-#endif /* AVCODEC_OPUSENC_PSY_H */
+#endif /* AVCODEC_OPUS_ENC_PSY_H */
diff --git a/libavcodec/opusenc_utils.h b/libavcodec/opus/enc_utils.h
index c76295979a..3ebcdbbb6f 100644
--- a/libavcodec/opusenc_utils.h
+++ b/libavcodec/opus/enc_utils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUSENC_UTILS_H
-#define AVCODEC_OPUSENC_UTILS_H
+#ifndef AVCODEC_OPUS_ENC_UTILS_H
+#define AVCODEC_OPUS_ENC_UTILS_H
 
 #include <math.h>
 #include <string.h>
@@ -87,4 +87,4 @@ static inline float bessel_filter(FFBesselFilter *s, float x)
     return s->y[0];
 }
 
-#endif /* AVCODEC_OPUSENC_UTILS_H */
+#endif /* AVCODEC_OPUS_ENC_UTILS_H */
diff --git a/libavcodec/opus.h b/libavcodec/opus/opus.h
index f87b63aaca..9b1693329e 100644
--- a/libavcodec/opus.h
+++ b/libavcodec/opus/opus.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUS_H
-#define AVCODEC_OPUS_H
+#ifndef AVCODEC_OPUS_OPUS_H
+#define AVCODEC_OPUS_OPUS_H
 
 #include <stdint.h>
 
@@ -56,4 +56,4 @@ enum OpusBandwidth {
     OPUS_BANDWITH_NB
 };
 
-#endif /* AVCODEC_OPUS_H */
+#endif /* AVCODEC_OPUS_OPUS_H */
diff --git a/libavcodec/opus_parse.c b/libavcodec/opus/parse.c
index e922d1f304..78a2a75fc7 100644
--- a/libavcodec/opus_parse.c
+++ b/libavcodec/opus/parse.c
@@ -35,7 +35,7 @@
 #include "internal.h"
 #include "mathops.h"
 #include "opus.h"
-#include "opus_parse.h"
+#include "parse.h"
 #include "vorbis_data.h"
 
 static const uint16_t opus_frame_duration[32] = {
diff --git a/libavcodec/opus_parse.h b/libavcodec/opus/parse.h
index 83ed3c7887..467957364f 100644
--- a/libavcodec/opus_parse.h
+++ b/libavcodec/opus/parse.h
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "opus.h"
 
 typedef struct OpusPacket {
diff --git a/libavcodec/opus_parser.c b/libavcodec/opus/parser.c
index 3bdacf7cd5..41665e68f9 100644
--- a/libavcodec/opus_parser.c
+++ b/libavcodec/opus/parser.c
@@ -29,7 +29,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "opus.h"
-#include "opus_parse.h"
+#include "parse.h"
 #include "parser.h"
 
 typedef struct OpusParserContext {
diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus/pvq.c
index b16916fbfb..fe57ab02ce 100644
--- a/libavcodec/opus_pvq.c
+++ b/libavcodec/opus/pvq.c
@@ -29,8 +29,8 @@
 
 #include "libavutil/mem.h"
 #include "mathops.h"
-#include "opustab.h"
-#include "opus_pvq.h"
+#include "tab.h"
+#include "pvq.h"
 
 #define ROUND_MUL16(a,b)  ((MUL16(a, b) + 16384) >> 15)
 
diff --git a/libavcodec/opus_pvq.h b/libavcodec/opus/pvq.h
index b71bc49034..07f568f6c0 100644
--- a/libavcodec/opus_pvq.h
+++ b/libavcodec/opus/pvq.h
@@ -25,7 +25,7 @@
 
 #include "libavutil/mem_internal.h"
 
-#include "opus_celt.h"
+#include "celt.h"
 
 #define QUANT_FN(name) uint32_t (name)(struct CeltPVQ *pvq, CeltFrame *f,            \
                                        OpusRangeCoder *rc, const int band, float *X, \
diff --git a/libavcodec/opus_rc.c b/libavcodec/opus/rc.c
index 0687e9e779..8e58a52b85 100644
--- a/libavcodec/opus_rc.c
+++ b/libavcodec/opus/rc.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "opus_rc.h"
+#include "rc.h"
 
 #define OPUS_RC_BITS 32
 #define OPUS_RC_SYM  8
diff --git a/libavcodec/opus_rc.h b/libavcodec/opus/rc.h
index 4cd2378bdf..e9407f2ca4 100644
--- a/libavcodec/opus_rc.h
+++ b/libavcodec/opus/rc.h
@@ -24,7 +24,9 @@
 #define AVCODEC_OPUS_RC_H
 
 #include <stdint.h>
-#include "get_bits.h"
+
+#include "libavcodec/get_bits.h"
+
 #include "opus.h"
 
 #define opus_ilog(i) (av_log2(i) + !!(i))
diff --git a/libavcodec/opus_silk.c b/libavcodec/opus/silk.c
index 98ffe00b26..97bb95037c 100644
--- a/libavcodec/opus_silk.c
+++ b/libavcodec/opus/silk.c
@@ -29,9 +29,9 @@
 #include "libavutil/mem.h"
 #include "mathops.h"
 #include "opus.h"
-#include "opus_rc.h"
-#include "opus_silk.h"
-#include "opustab.h"
+#include "rc.h"
+#include "silk.h"
+#include "tab.h"
 
 #define ROUND_MULL(a,b,s) (((MUL64(a, b) >> ((s) - 1)) + 1) >> 1)
 
diff --git a/libavcodec/opus_silk.h b/libavcodec/opus/silk.h
index 4b595da2b9..824b492715 100644
--- a/libavcodec/opus_silk.h
+++ b/libavcodec/opus/silk.h
@@ -24,7 +24,7 @@
 #define AVCODEC_OPUS_SILK_H
 
 #include "opus.h"
-#include "opus_rc.h"
+#include "rc.h"
 
 #define SILK_HISTORY                 322
 #define SILK_MAX_LPC                 16
diff --git a/libavcodec/opustab.c b/libavcodec/opus/tab.c
index 917375253e..e7d20d1688 100644
--- a/libavcodec/opustab.c
+++ b/libavcodec/opus/tab.c
@@ -22,7 +22,7 @@
 
 #include "libavutil/mem_internal.h"
 
-#include "opustab.h"
+#include "tab.h"
 
 const uint8_t ff_opus_default_coupled_streams[] = { 0, 1, 1, 2, 2, 2, 2, 3 };
 
diff --git a/libavcodec/opustab.h b/libavcodec/opus/tab.h
index 57e546aef5..109a422b9f 100644
--- a/libavcodec/opustab.h
+++ b/libavcodec/opus/tab.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPUSTAB_H
-#define AVCODEC_OPUSTAB_H
+#ifndef AVCODEC_OPUS_TAB_H
+#define AVCODEC_OPUS_TAB_H
 
 #include <stdint.h>
 
@@ -166,4 +166,4 @@ extern const float    ff_opus_deemph_weights[];
 extern const uint32_t * const ff_celt_pvq_u_row[15];
 FF_VISIBILITY_POP_HIDDEN
 
-#endif /* AVCODEC_OPUSTAB_H */
+#endif /* AVCODEC_OPUS_TAB_H */
diff --git a/libavcodec/riscv/opusdsp_init.c b/libavcodec/riscv/opusdsp_init.c
index 7ec261493b..6fc5e37439 100644
--- a/libavcodec/riscv/opusdsp_init.c
+++ b/libavcodec/riscv/opusdsp_init.c
@@ -23,7 +23,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/riscv/cpu.h"
-#include "libavcodec/opusdsp.h"
+#include "libavcodec/opus/dsp.h"
 
 void ff_opus_postfilter_rvv(float *data, int period, float *g, int len);
 
diff --git a/libavcodec/x86/celt_pvq_init.c b/libavcodec/x86/celt_pvq_init.c
index 5a0669e6f2..817d000038 100644
--- a/libavcodec/x86/celt_pvq_init.c
+++ b/libavcodec/x86/celt_pvq_init.c
@@ -23,7 +23,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/opus_pvq.h"
+#include "libavcodec/opus/pvq.h"
 
 extern float ff_pvq_search_approx_sse2(float *X, int *y, int K, int N);
 extern float ff_pvq_search_approx_sse4(float *X, int *y, int K, int N);
diff --git a/libavcodec/x86/opusdsp_init.c b/libavcodec/x86/opusdsp_init.c
index 66d6839589..83f7616a2e 100644
--- a/libavcodec/x86/opusdsp_init.c
+++ b/libavcodec/x86/opusdsp_init.c
@@ -20,7 +20,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/opusdsp.h"
+#include "libavcodec/opus/dsp.h"
 
 void ff_opus_postfilter_fma3(float *data, int period, float *gains, int len);
 float ff_opus_deemphasis_fma3(float *out, float *in, float coeff, const float *weights, int len);
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 6b02187eb1..04565a2011 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -34,7 +34,7 @@
 #include "libavcodec/bytestream.h"
 #include "libavcodec/defs.h"
 #include "libavcodec/get_bits.h"
-#include "libavcodec/opus.h"
+#include "libavcodec/opus/opus.h"
 #include "avformat.h"
 #include "mpegts.h"
 #include "internal.h"
diff --git a/tests/checkasm/opusdsp.c b/tests/checkasm/opusdsp.c
index b9ecc55240..76fb97653c 100644
--- a/tests/checkasm/opusdsp.c
+++ b/tests/checkasm/opusdsp.c
@@ -18,8 +18,8 @@
 
 #include "libavutil/mem_internal.h"
 
-#include "libavcodec/opusdsp.h"
-#include "libavcodec/opustab.h"
+#include "libavcodec/opus/dsp.h"
+#include "libavcodec/opus/tab.h"
 
 #include "checkasm.h"