commit e77c76dc57f88ec9e6b370dcba8a8c3e0684461d
author Andreas Huber <andih@google.com> Wed Jun 20 14:31:30 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 20 14:31:30 2012 -0700
tree b08937eba3171d30a27df1c07e38cb5f930baab9
parent ff8977f3392036b387fc2f65056bcf19f9942c9d
parent 39a3113539f9bcc86a8efe562780c23ac8731098

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.

media/libstagefright/codecs/aacdec/SoftAAC.h

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 @@
 
 private:
     enum {
-        kNumInputBuffers        = 32,
+        kNumInputBuffers        = 4,
         kNumOutputBuffers       = 4,
     };
 

media/libstagefright/codecs/aacdec/SoftAAC2.h

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 @@
 
 private:
     enum {
-        kNumInputBuffers        = 32,
+        kNumInputBuffers        = 4,
         kNumOutputBuffers       = 4,
     };