commit 30ac46ec488e889644049bc9bd4fc7167fcb35c2
author Andy Hung <hunga@google.com> Tue Oct 21 22:57:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 21 22:57:51 2014 +0000
tree 4f76b300331bd3f06b80d40dc6431f1fca601524
parent 63f6757063c86f4206166aecb2b6ec1b3e3d8078
parent b31e02535a5bd3830eb8f86d8e6b3918656c6ae2

Merge "MediaCodecTest: don't assume encoder can use input buffers" into lmp-dev

tests/tests/media/src/android/media/cts/MediaCodecTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
index 6726728..f72e3a0 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
@@ -402,8 +402,7 @@
             inputSurface.makeCurrent();
             encoder.start();
 
-            int totalBuffers = encoder.getInputBuffers().length +
-                    encoder.getOutputBuffers().length;
+            int totalBuffers = encoder.getOutputBuffers().length;
             if (VERBOSE) Log.d(TAG, "Total buffers: " + totalBuffers);
 
             // Submit several frames quickly, without draining the encoder output, to try to