virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-10 14:30:30 +02:00
parent ab1bc2f745
commit 044bfc7785
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacenctab.c
View File

@ -25,9 +25,7 @@ static const uint8_t swb_size_128_96[] = {
4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36 4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
}; };
static const uint8_t swb_size_128_64[] = { #define swb_size_128_64 swb_size_128_96
4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
};
static const uint8_t swb_size_128_48[] = { static const uint8_t swb_size_128_48[] = {
4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16 4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16

12
libavcodec/aactab.c
View File

@ -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 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[] = { const uint8_t ff_aac_num_swb_96[] = {
12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14 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 544, 576, 608, 640, 672, 704, 736, 768
}; };
static const uint16_t swb_offset_768_32[] = #define swb_offset_768_32 swb_offset_768_48
{
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
};
static const uint16_t swb_offset_768_24[] = static const uint16_t swb_offset_768_24[] =
{ {

2
libavcodec/aactab.h
View File

@ -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_512 [];
extern const uint8_t ff_aac_num_swb_480 []; 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_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 []; extern const uint8_t ff_aac_num_swb_96 [];
// @} // @}