[FFmpeg-cvslog] avcodec/aac{enc,}tab: Deduplicate swb tables

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Apr 10 14:30:30 2025 +0200| [044bfc7785650102f1e3e27868dc40b023d90d5f] | committer: Andreas Rheinhardt

avcodec/aac{enc,}tab: Deduplicate swb tables

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=044bfc7785650102f1e3e27868dc40b023d90d5f
---

 libavcodec/aacenctab.c |  4 +---
 libavcodec/aactab.c    | 12 +-----------
 libavcodec/aactab.h    |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c
index ca09e22ca8..fd40e076e2 100644
--- a/libavcodec/aacenctab.c
+++ b/libavcodec/aacenctab.c
@@ -25,9 +25,7 @@ static const uint8_t swb_size_128_96[] = {
     4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
 };
 
-static const uint8_t swb_size_128_64[] = {
-    4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
-};
+#define swb_size_128_64 swb_size_128_96
 
 static const uint8_t swb_size_128_48[] = {
     4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index 4e2739ecb1..128bacfdf1 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -170,10 +170,6 @@ const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
 };
 
-const uint8_t ff_aac_num_swb_120[] = {
-    12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
-};
-
 const uint8_t ff_aac_num_swb_96[] = {
     12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14
 };
@@ -1838,13 +1834,7 @@ static const uint16_t swb_offset_768_48[] =
     544, 576, 608, 640, 672, 704, 736, 768
 };
 
-static const uint16_t swb_offset_768_32[] =
-{
-    0,   4,   8,   12,  16,  20,  24,  28,  32,  36,  40,  48,
-    56,  64,  72,  80,  88,  96,  108, 120, 132, 144, 160, 176,
-    196, 216, 240, 264, 292, 320, 352, 384, 416, 448, 480, 512,
-    544, 576, 608, 640, 672, 704, 736, 768
-};
+#define swb_offset_768_32 swb_offset_768_48
 
 static const uint16_t swb_offset_768_24[] =
 {
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index e286d98385..e7dbbf1ecd 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -76,7 +76,7 @@ extern const uint8_t ff_aac_num_swb_768 [];
 extern const uint8_t ff_aac_num_swb_512 [];
 extern const uint8_t ff_aac_num_swb_480 [];
 extern const uint8_t ff_aac_num_swb_128 [];
-extern const uint8_t ff_aac_num_swb_120 [];
+#define ff_aac_num_swb_120 ff_aac_num_swb_128
 extern const uint8_t ff_aac_num_swb_96  [];
 // @}