am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" (6736cca0) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	* ...		* ...
	* }		* }
	* }		* }