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

am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"

Browse Source 
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
  mediacodec: Don't suggest calling getOutputFormat() immediately
This commit is contained in:
Jean-Baptiste Queru
2012-08-08 13:08:21 -07:00
committed by Android Git Automerger
parent be3d2cf10b 52410be8ec
commit 6736cca08d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@ import java.util.Map;
* codec.start(); * codec.start();
* ByteBuffer[] inputBuffers = codec.getInputBuffers(); * ByteBuffer[] inputBuffers = codec.getInputBuffers();
* ByteBuffer[] outputBuffers = codec.getOutputBuffers(); * ByteBuffer[] outputBuffers = codec.getOutputBuffers();
* MediaFormat format = codec.getOutputFormat();
* for (;;) { * for (;;) {
* int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs); * int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs);
* if (inputBufferIndex >= 0) { * if (inputBufferIndex >= 0) {
@@ -51,7 +50,7 @@ import java.util.Map;
* outputBuffers = codec.getOutputBuffers(); * outputBuffers = codec.getOutputBuffers();
* } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) { * } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
* // Subsequent data will conform to new format. * // Subsequent data will conform to new format.
* format = codec.getOutputFormat(); * MediaFormat format = codec.getOutputFormat();
* ... * ...
* } * }
* } * }