diff options
| author | Martin Storsjo <martin@martin.st> | 2012-07-13 12:57:13 +0300 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-08-07 11:07:12 -0700 |
| commit | b529e4c9ca8a6790162275ac2e481f768a6d585f (patch) | |
| tree | 6ebec2f7a8de0d34110d22e5faeea40ca3b01c3f /media/java | |
| parent | 6624afe37b3be7c469a3613298a2246663a2d409 (diff) | |
| download | frameworks_base-b529e4c9ca8a6790162275ac2e481f768a6d585f.zip frameworks_base-b529e4c9ca8a6790162275ac2e481f768a6d585f.tar.gz frameworks_base-b529e4c9ca8a6790162275ac2e481f768a6d585f.tar.bz2 | |
mediacodec: Don't suggest calling getOutputFormat() immediately
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)
Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 560c549..99db066 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -33,7 +33,6 @@ import java.util.Map; * codec.start(); * ByteBuffer[] inputBuffers = codec.getInputBuffers(); * ByteBuffer[] outputBuffers = codec.getOutputBuffers(); - * MediaFormat format = codec.getOutputFormat(); * for (;;) { * int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs); * if (inputBufferIndex >= 0) { @@ -51,7 +50,7 @@ import java.util.Map; * outputBuffers = codec.getOutputBuffers(); * } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) { * // Subsequent data will conform to new format. - * format = codec.getOutputFormat(); + * MediaFormat format = codec.getOutputFormat(); * ... * } * } |