From 5b2d2cf6b9942eb742d2d27083a62f9500fc2b80 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Tue, 26 Jul 2022 11:09:17 -0700 Subject: Revert "MediaCodec: don't cache buffers until requested" This reverts commit 07358dfea5d63baf80608536c2a3dff6ed0f44e1. Merged-In: I2e52c3abdd13fa0547a510b3599e082e3bff0989 Change-Id: I2e52c3abdd13fa0547a510b3599e082e3bff0989 --- media/java/android/media/MediaCodec.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 3dc927c6442f..72dd2bd43eb6 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -2282,6 +2282,10 @@ final public class MediaCodec { */ public final void start() { native_start(); + synchronized(mBufferLock) { + cacheBuffers(true /* input */); + cacheBuffers(false /* input */); + } } private native final void native_start(); @@ -3912,9 +3916,6 @@ 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(); } @@ -3953,9 +3954,6 @@ 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(); } -- cgit v1.2.3-59-g8ed1b