Merge "MediaCodec: don't cache buffers until requested" into tm-dev (d7d0d4b1) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -2317,10 +2317,6 @@ final public class MediaCodec {
		*/
		public final void start() {
		native_start();
		synchronized(mBufferLock) {
		cacheBuffers(true /* input */);
		cacheBuffers(false /* input */);
		}
		}
		private native final void native_start();

		@@ -3951,6 +3947,9 @@ final public class MediaCodec {
		+ "Please obtain MediaCodec.LinearBlock or HardwareBuffer "
		+ "objects and attach to QueueRequest objects.");
		}
		if (mCachedInputBuffers == null) {
		cacheBuffers(true /* input */);
		}
		if (mCachedInputBuffers == null) {
		throw new IllegalStateException();
		}
		@@ -3989,6 +3988,9 @@ final public class MediaCodec {
		+ "is not compatible with CONFIGURE_FLAG_USE_BLOCK_MODEL. "
		+ "Please use getOutputFrame to get output frames.");
		}
		if (mCachedOutputBuffers == null) {
		cacheBuffers(false /* input */);
		}
		if (mCachedOutputBuffers == null) {
		throw new IllegalStateException();
		}