summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-27 13:15:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-27 13:15:15 -0800
commite912404f85f9b4e10d2ba4123de5098bd6b9b0d3 (patch)
tree1dcf8f2a3a77ab29f1c7c0ed3b24176db3778e46 /media/libstagefright/codecs
parent308eb8f51f430e851c672fe5a034693995c7e95d (diff)
parent19bb62613f512b62d492fb4caf36de88fd1914dd (diff)
downloadframeworks_base-e912404f85f9b4e10d2ba4123de5098bd6b9b0d3.zip
frameworks_base-e912404f85f9b4e10d2ba4123de5098bd6b9b0d3.tar.gz
frameworks_base-e912404f85f9b4e10d2ba4123de5098bd6b9b0d3.tar.bz2
am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '19bb62613f512b62d492fb4caf36de88fd1914dd': stagefright aacenc: Add prototypes for arm specific implementations of functions
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/aacenc/src/transform.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/transform.c b/media/libstagefright/codecs/aacenc/src/transform.c
index a154a2f..a02336f 100644
--- a/media/libstagefright/codecs/aacenc/src/transform.c
+++ b/media/libstagefright/codecs/aacenc/src/transform.c
@@ -339,6 +339,12 @@ static void PostMDCT(int *buf0, int num, const int *csptr)
*buf1-- = MULHIGH(cosb, tr2) + MULHIGH(sinb, ti2);
}
}
+#else
+void Radix4First(int *buf, int num);
+void Radix8First(int *buf, int num);
+void Radix4FFT(int *buf, int num, int bgn, int *twidTab);
+void PreMDCT(int *buf0, int num, const int *csptr);
+void PostMDCT(int *buf0, int num, const int *csptr);
#endif