summaryrefslogtreecommitdiff
path: root/libavcodec/sinewin.h
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-11-22 14:27:45 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-12-08 17:51:47 +0100
commitcdea393093ebe10ac2222739d480aeb2f6a0bcc8 (patch)
tree521759a46519e4b447431ba214e0fe65757d93f4 /libavcodec/sinewin.h
parent7688f94e90ee254382ee9c8cde81eed6408cf0f2 (diff)
downloadffmpeg-cdea393093ebe10ac2222739d480aeb2f6a0bcc8.tar.gz
avcodec/aacdec, sinewin: Move 120 and 960 point sine tables to aacdec
The floating point AAC decoder is the only user of these tables, so it makes sense to move them there. Furthermore, initializing the ordinary power-of-two sinetables is currently not thread-safe and if the 120- and 960-point sinetables were not moved, one would have to choose whether to guard initializing these two tables with their own AVOnces or not. Doing so would add unnecessary AVOnces as the AAC decoder already guards initializing its static data by an AVOnce; not doing so would be fragile if a second user of these tables were to be added. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/sinewin.h')
-rw-r--r--libavcodec/sinewin.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/sinewin.h b/libavcodec/sinewin.h
index 329e9bb5be..7b64096a71 100644
--- a/libavcodec/sinewin.h
+++ b/libavcodec/sinewin.h
@@ -38,9 +38,6 @@
#define SINETABLE(size) \
SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size]
-#define SINETABLE120960(size) \
- DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size]
-
/**
* Generate a sine window.
* @param window pointer to half window
@@ -55,11 +52,9 @@ void AAC_RENAME(ff_init_ff_sine_windows)(int index);
extern SINETABLE( 32);
extern SINETABLE( 64);
-extern SINETABLE120960(120);
extern SINETABLE( 128);
extern SINETABLE( 256);
extern SINETABLE( 512);
-extern SINETABLE120960(960);
extern SINETABLE(1024);
extern SINETABLE(2048);
extern SINETABLE(4096);