summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-06-20 14:31:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-20 14:31:45 -0700
commit1c1a61cb1765c083a199c63863c2f6ae417e63d5 (patch)
treeafea45abd87939850b5a13eb0fb47f89f282a36b
parent6b3c8a345d37d2cd9670ad6d94ce12c46a07f0b0 (diff)
parent39a3113539f9bcc86a8efe562780c23ac8731098 (diff)
downloadframeworks_av-1c1a61cb1765c083a199c63863c2f6ae417e63d5.zip
frameworks_av-1c1a61cb1765c083a199c63863c2f6ae417e63d5.tar.gz
frameworks_av-1c1a61cb1765c083a199c63863c2f6ae417e63d5.tar.bz2
am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '39a3113539f9bcc86a8efe562780c23ac8731098': Revert input buffer count for the SoftAAC* decoders back to 4.
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC.h2
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC.h b/media/libstagefright/codecs/aacdec/SoftAAC.h
index c0789ab..2e75005 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC.h
+++ b/media/libstagefright/codecs/aacdec/SoftAAC.h
@@ -45,7 +45,7 @@ protected:
private:
enum {
- kNumInputBuffers = 32,
+ kNumInputBuffers = 4,
kNumOutputBuffers = 4,
};
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.h b/media/libstagefright/codecs/aacdec/SoftAAC2.h
index ac379f4..0353196 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.h
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.h
@@ -44,7 +44,7 @@ protected:
private:
enum {
- kNumInputBuffers = 32,
+ kNumInputBuffers = 4,
kNumOutputBuffers = 4,
};