Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lajos Molnar
2014-09-25 00:19:43 +00:00
committed by Android (Google) Code Review
parent 77e7054176 b15ed6337c
commit 17ffc40362
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/java/android/media/MediaCodec.java
View File

@@ -830,8 +830,8 @@ final public class MediaCodec {
try {
native_queueInputBuffer(
index, offset, size, presentationTimeUs, flags);
} catch (CryptoException e) {
validateInputByteBuffer(mCachedInputBuffers, index);
} catch (CryptoException | IllegalStateException e) {
revalidateByteBuffer(mCachedInputBuffers, index);
throw e;
}
}
@@ -955,8 +955,8 @@ final public class MediaCodec {
try {
native_queueSecureInputBuffer(
index, offset, info, presentationTimeUs, flags);
} catch (CryptoException e) {
validateInputByteBuffer(mCachedInputBuffers, index);
} catch (CryptoException | IllegalStateException e) {
revalidateByteBuffer(mCachedInputBuffers, index);
throw e;
}
}
@@ -1280,6 +1280,18 @@ final public class MediaCodec {
}
}
private final void revalidateByteBuffer(
ByteBuffer[] buffers, int index) {
synchronized(mBufferLock) {
if (buffers != null && index >= 0 && index < buffers.length) {
ByteBuffer buffer = buffers[index];
if (buffer != null) {
buffer.setAccessible(true);
}
}
}
}
private final void validateOutputByteBuffer(
ByteBuffer[] buffers, int index, BufferInfo info) {
if (buffers != null && index >= 0 && index < buffers.length) {
@@ -1317,7 +1329,7 @@ final public class MediaCodec {
}
private final void freeAllTrackedBuffers() {
synchronized (mBufferLock) {
synchronized(mBufferLock) {
freeByteBuffers(mCachedInputBuffers);
freeByteBuffers(mCachedOutputBuffers);
mCachedInputBuffers = null;