From f55b587820847c4ce442a2dc2eda2b68bcbefd11 Mon Sep 17 00:00:00 2001
From: Lynne <dev@lynne.ee>
Date: Thu, 29 Feb 2024 04:52:58 +0100
Subject: [PATCH] aacdec: move aacdec_common to aac/aacdec_tab

Start to clean up the decoder.
Also renames a confusingly named file.
---
 libavcodec/Makefile                              |  5 +++--
 libavcodec/aac/Makefile                          |  5 +++++
 libavcodec/{aacdec_common.c => aac/aacdec_tab.c} | 11 ++++++-----
 libavcodec/{aacdectab.h => aac/aacdec_tab.h}     |  8 ++++----
 libavcodec/aacdec.c                              |  2 +-
 libavcodec/aacdec_fixed.c                        |  2 +-
 libavcodec/aacsbr_template.c                     |  2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 libavcodec/aac/Makefile
 rename libavcodec/{aacdec_common.c => aac/aacdec_tab.c} (99%)
 rename libavcodec/{aacdectab.h => aac/aacdec_tab.h} (91%)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e1df848f53..f2da83c8eb 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -64,6 +64,7 @@ OBJS = ac3_parser.o                                                     \
        xiph.o                                                           \
 
 # subsystems
+include $(SRC_PATH)/libavcodec/aac/Makefile
 include $(SRC_PATH)/libavcodec/vvc/Makefile
 -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
 OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
@@ -179,11 +180,11 @@ OBJS-$(CONFIG_WMV2DSP)                 += wmv2dsp.o
 OBJS-$(CONFIG_ZERO12V_DECODER)         += 012v.o
 OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
 OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
-OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aacdec_common.o aactab.o \
+OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o \
                                           aacsbr.o aacps_common.o aacps_float.o \
                                           kbdwin.o \
                                           sbrdsp.o aacpsdsp_float.o cbrt_data.o
-OBJS-$(CONFIG_AAC_FIXED_DECODER)       += aacdec_fixed.o aacdec_common.o aactab.o \
+OBJS-$(CONFIG_AAC_FIXED_DECODER)       += aacdec_fixed.o aactab.o \
                                           aacsbr_fixed.o aacps_common.o aacps_fixed.o \
                                           kbdwin.o \
                                           sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o
diff --git a/libavcodec/aac/Makefile b/libavcodec/aac/Makefile
new file mode 100644
index 0000000000..52facdf4cf
--- /dev/null
+++ b/libavcodec/aac/Makefile
@@ -0,0 +1,5 @@
+clean::
+		$(RM) $(CLEANSUFFIXES:%=libavcodec/aac/%)
+
+OBJS-$(CONFIG_AAC_DECODER)          +=  aac/aacdec_tab.o
+OBJS-$(CONFIG_AAC_FIXED_DECODER)    +=  aac/aacdec_tab.o
diff --git a/libavcodec/aacdec_common.c b/libavcodec/aac/aacdec_tab.c
similarity index 99%
rename from libavcodec/aacdec_common.c
rename to libavcodec/aac/aacdec_tab.c
index 145c718047..45a84a9a72 100644
--- a/libavcodec/aacdec_common.c
+++ b/libavcodec/aac/aacdec_tab.c
@@ -25,11 +25,12 @@
  * Common code and tables of the AAC fixed- and floating-point decoders
  */
 
-#include "aac.h"
-#include "aacdectab.h"
-#include "aacps.h"
-#include "aactab.h"
-#include "vlc.h"
+#include "aacdec_tab.h"
+
+#include "libavcodec/aac.h"
+#include "libavcodec/aacps.h"
+#include "libavcodec/aactab.h"
+#include "libavcodec/vlc.h"
 
 #include "libavutil/attributes.h"
 #include "libavutil/thread.h"
diff --git a/libavcodec/aacdectab.h b/libavcodec/aac/aacdec_tab.h
similarity index 91%
rename from libavcodec/aacdectab.h
rename to libavcodec/aac/aacdec_tab.h
index 184508f2f3..70e49af202 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aac/aacdec_tab.h
@@ -25,12 +25,12 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef AVCODEC_AACDECTAB_H
-#define AVCODEC_AACDECTAB_H
+#ifndef AVCODEC_AAC_AACDEC_TAB_H
+#define AVCODEC_AAC_AACDEC_TAB_H
 
 #include <stdint.h>
 
-#include "vlc.h"
+#include "libavcodec/vlc.h"
 
 #include "libavutil/attributes_internal.h"
 #include "libavutil/channel_layout.h"
@@ -52,4 +52,4 @@ extern const int16_t ff_aac_channel_map[3][4][6];
 extern const AVChannelLayout ff_aac_ch_layout[];
 FF_VISIBILITY_POP_HIDDEN
 
-#endif /* AVCODEC_AACDECTAB_H */
+#endif /* AVCODEC_AAC_AACDEC_TAB_H */
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index b4870a6b1f..9c1b0cdc1f 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -47,7 +47,7 @@
 #include "aac.h"
 #include "aacdec.h"
 #include "aactab.h"
-#include "aacdectab.h"
+#include "aac/aacdec_tab.h"
 #include "adts_header.h"
 #include "cbrt_data.h"
 #include "sbr.h"
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 305bb0ba9a..681e502e42 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -72,7 +72,7 @@
 #include "aac.h"
 #include "aacdec.h"
 #include "aactab.h"
-#include "aacdectab.h"
+#include "aac/aacdec_tab.h"
 #include "adts_header.h"
 #include "cbrt_data.h"
 #include "sbr.h"
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
index cdfaed636b..eadd6fa2d3 100644
--- a/libavcodec/aacsbr_template.c
+++ b/libavcodec/aacsbr_template.c
@@ -33,7 +33,7 @@
  */
 
 #include "aacdec.h"
-#include "aacdectab.h"
+#include "aac/aacdec_tab.h"
 #include "avcodec.h"
 #include "libavutil/qsort.h"