diff options
| author | Wonsik Kim <wonsik@google.com> | 2020-02-21 11:24:32 -0800 |
|---|---|---|
| committer | Wonsik Kim <wonsik@google.com> | 2020-02-22 08:23:30 +0000 |
| commit | 4a728ca2e5400ffb82619376f354e52ef8faa92b (patch) | |
| tree | fe862a848848fca0a45fad2bc72afabcd7c949e7 /media/java/android/media/MediaCodec.java | |
| parent | 3f9ddc30d980652f610f86959a3bf32669ff661e (diff) | |
media: fix MediaCodecTest#testException
Bug: 150004878
Test: atest CtsMediaTestCases:MediaCodecTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I779aa12bea633cee755aba46231e1b8c8e67b2cd
Merged-In: I779aa12bea633cee755aba46231e1b8c8e67b2cd
(cherry picked from commit 253f0046ba5a3c3621a6911f7ee11dceb38300fd)
Diffstat (limited to 'media/java/android/media/MediaCodec.java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index f2b4db1afdac..f800f9ee91c9 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -2531,7 +2531,7 @@ final public class MediaCodec { int offset, int size, long presentationTimeUs, int flags) throws CryptoException { synchronized(mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } invalidateByteBuffer(mCachedInputBuffers, index); @@ -2783,7 +2783,7 @@ final public class MediaCodec { long presentationTimeUs, int flags) throws CryptoException { synchronized(mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } invalidateByteBuffer(mCachedInputBuffers, index); @@ -2818,7 +2818,7 @@ final public class MediaCodec { */ public final int dequeueInputBuffer(long timeoutUs) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } @@ -3534,7 +3534,7 @@ final public class MediaCodec { public final int dequeueOutputBuffer( @NonNull BufferInfo info, long timeoutUs) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } @@ -3916,7 +3916,7 @@ final public class MediaCodec { @NonNull public ByteBuffer[] getInputBuffers() { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } if (mCachedInputBuffers == null) { @@ -3952,7 +3952,7 @@ final public class MediaCodec { @NonNull public ByteBuffer[] getOutputBuffers() { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } if (mCachedOutputBuffers == null) { @@ -3984,7 +3984,7 @@ final public class MediaCodec { @Nullable public ByteBuffer getInputBuffer(int index) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } @@ -4018,7 +4018,7 @@ final public class MediaCodec { @Nullable public Image getInputImage(int index) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } @@ -4052,7 +4052,7 @@ final public class MediaCodec { @Nullable public ByteBuffer getOutputBuffer(int index) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } @@ -4085,7 +4085,7 @@ final public class MediaCodec { @Nullable public Image getOutputImage(int index) { synchronized (mBufferLock) { - if (mBufferMode != BUFFER_MODE_LEGACY) { + if (mBufferMode == BUFFER_MODE_BLOCK) { throw new IncompatibleWithBlockModelException(); } } |