aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec_fixed.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-01 03:04:21 +0100
committerLynne <dev@lynne.ee>2024-04-23 08:31:27 +0200
commit6975d965fcb64e8f68dcbe5be88805e401ee72cd (patch)
tree5bc88009fd70c7f08f8d11d26fa6003abda2a33f /libavcodec/aacdec_fixed.c
parent3600f757db3f908df0fcd5b5e1999aca22c41a5b (diff)
downloadffmpeg-6975d965fcb64e8f68dcbe5be88805e401ee72cd.tar.gz
avcodec/aacsbr: Make ff_aac_sbr_* funcs accept ChannelElement*
Each ChannelElement contains exactly one SpectralBandReplication structure; the latter structure contains lots of buffers whose size depend upon USE_FIXED (i.e. AAC_FLOAT arrays). This complicates deduplicating the parts of the AAC decoder that are duplicated between the fixed-point and the floating point decoder. In order to fix this, the SpectralBandReplication structure will be moved from the part of ChannelElement visible to the common code. Therefore the ff_aac_sbr_* functions are ported to accept a ChannelElement*; they will then have to translate that to the corresponding SpectralBandReplication* themselves (which is possible, because there are floating-point and fixed-point versions of these functions). While just at it, also ensure that these functions are properly namespaced. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/aacdec_fixed.c')
-rw-r--r--libavcodec/aacdec_fixed.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 681e502e42..055b40b547 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -75,7 +75,6 @@
#include "aac/aacdec_tab.h"
#include "adts_header.h"
#include "cbrt_data.h"
-#include "sbr.h"
#include "aacsbr.h"
#include "mpeg4audio.h"
#include "profiles.h"