commit 7e28fc7370ae26666358553122f0dc20e2b2262a
author Lajos Molnar <lajos@google.com> Wed Sep 24 23:40:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 24 23:40:56 2014 +0000
tree ad018f0bb3d9befd0d2e6a38764d8327bfacd728
parent 0a285b4462719b938dfd5bf54808a9a4a2e3e5b5
parent 00bbc7d9faa0830ea15e4846083508b38ceff6e5

Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev

media/java/android/media/MediaCodec.java

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 5fb4f12..bf68921 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -827,8 +827,13 @@
             invalidateByteBuffer(mCachedInputBuffers, index);
             mDequeuedInputBuffers.remove(index);
         }
-        native_queueInputBuffer(
-                index, offset, size, presentationTimeUs, flags);
+        try {
+            native_queueInputBuffer(
+                    index, offset, size, presentationTimeUs, flags);
+        } catch (CryptoException e) {
+            validateInputByteBuffer(mCachedInputBuffers, index);
+            throw e;
+        }
     }
 
     private native final void native_queueInputBuffer(
@@ -947,8 +952,13 @@
             invalidateByteBuffer(mCachedInputBuffers, index);
             mDequeuedInputBuffers.remove(index);
         }
-        native_queueSecureInputBuffer(
-                index, offset, info, presentationTimeUs, flags);
+        try {
+            native_queueSecureInputBuffer(
+                    index, offset, info, presentationTimeUs, flags);
+        } catch (CryptoException e) {
+            validateInputByteBuffer(mCachedInputBuffers, index);
+            throw e;
+        }
     }
 
     private native final void native_queueSecureInputBuffer(