Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d97041b authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: don't cache buffers until requested" am: 4f9ab851 am:... 

Merge "MediaCodec: don't cache buffers until requested" am: 4f9ab851 am: de5a8def am: 9f1aca43

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092586



Change-Id: I77b7ac86ba38e2ee112f6a93b4e271804b8da6c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6fa971e 9f1aca43

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();

            }