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

Commit de5a8def 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 

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



Change-Id: Id528acf63dc708194f1a4bbe2250a9261e0b6359
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3f08c40 4f9ab851

media/java/android/media/MediaCodec.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -2282,10 +2282,6 @@ final public class MediaCodec { 
     */

     */

    public final void start() {

    public final void start() {

        native_start();

        native_start();

        synchronized(mBufferLock) {

            cacheBuffers(true /* input */);

            cacheBuffers(false /* input */);

        }

    }

    }

    private native final void native_start();

    private native final void native_start();
@@ -3916,6 +3912,9 @@ final public class MediaCodec { 
                        + "Please obtain MediaCodec.LinearBlock or HardwareBuffer "

                        + "Please obtain MediaCodec.LinearBlock or HardwareBuffer "

                        + "objects and attach to QueueRequest objects.");

                        + "objects and attach to QueueRequest objects.");

            }

            }

            if (mCachedInputBuffers == null) {

                cacheBuffers(true /* input */);

            }

            if (mCachedInputBuffers == null) {

            if (mCachedInputBuffers == null) {

                throw new IllegalStateException();

                throw new IllegalStateException();

            }

            }
@@ -3954,6 +3953,9 @@ final public class MediaCodec { 
                        + "is not compatible with CONFIGURE_FLAG_USE_BLOCK_MODEL. "

                        + "is not compatible with CONFIGURE_FLAG_USE_BLOCK_MODEL. "

                        + "Please use getOutputFrame to get output frames.");

                        + "Please use getOutputFrame to get output frames.");

            }

            }

            if (mCachedOutputBuffers == null) {

                cacheBuffers(false /* input */);

            }

            if (mCachedOutputBuffers == null) {

            if (mCachedOutputBuffers == null) {

                throw new IllegalStateException();

                throw new IllegalStateException();

            }

            }