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

Commit ce27c235 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached... 

am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev

* commit 'c8d99e5ca8b0c7d3e2e83023a6930fbf8664ce78':
  MediaCodec: revalidate cached queued input buffers if queue fails
parents 8d22be09 4867c6bf

media/java/android/media/MediaCodec.java

+14 −4
Original line number Diff line number Diff line
@@ -827,8 +827,13 @@ final public class MediaCodec { 
            invalidateByteBuffer(mCachedInputBuffers, index);

            mDequeuedInputBuffers.remove(index);

        }

        try {

            native_queueInputBuffer(

                    index, offset, size, presentationTimeUs, flags);

        } catch (CryptoException e) {

            validateInputByteBuffer(mCachedInputBuffers, index);

            throw e;

        }

    }



    private native final void native_queueInputBuffer(
@@ -947,8 +952,13 @@ final public class MediaCodec { 
            invalidateByteBuffer(mCachedInputBuffers, index);

            mDequeuedInputBuffers.remove(index);

        }

        try {

            native_queueSecureInputBuffer(

                    index, offset, info, presentationTimeUs, flags);

        } catch (CryptoException e) {

            validateInputByteBuffer(mCachedInputBuffers, index);

            throw e;

        }

    }



    private native final void native_queueSecureInputBuffer(