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

Commit 6abd17ed authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

MediaCodec: LinearBlock API for optional crypto 

Split setter for LinearBlock in QueueRequest between:
- setLinearBlock for unencrypted streams
- setEncryptedLinearBlock with non-null crypto info

Bug: 149487982
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I7d147b3963febeb431b268262343c782f2c1e3e9
parent 294823f0

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -25341,11 +25341,12 @@ package android.media { 
  public final class MediaCodec.QueueRequest {

    method public void queue();

    method @NonNull public android.media.MediaCodec.QueueRequest setByteBufferParameter(@NonNull String, @NonNull java.nio.ByteBuffer);

    method @NonNull public android.media.MediaCodec.QueueRequest setEncryptedLinearBlock(@NonNull android.media.MediaCodec.LinearBlock, int, int, @NonNull android.media.MediaCodec.CryptoInfo);

    method @NonNull public android.media.MediaCodec.QueueRequest setFlags(int);

    method @NonNull public android.media.MediaCodec.QueueRequest setFloatParameter(@NonNull String, float);

    method @NonNull public android.media.MediaCodec.QueueRequest setHardwareBuffer(@NonNull android.hardware.HardwareBuffer);

    method @NonNull public android.media.MediaCodec.QueueRequest setIntegerParameter(@NonNull String, int);

    method @NonNull public android.media.MediaCodec.QueueRequest setLinearBlock(@NonNull android.media.MediaCodec.LinearBlock, int, int, @Nullable android.media.MediaCodec.CryptoInfo);

    method @NonNull public android.media.MediaCodec.QueueRequest setLinearBlock(@NonNull android.media.MediaCodec.LinearBlock, int, int);

    method @NonNull public android.media.MediaCodec.QueueRequest setLongParameter(@NonNull String, long);

    method @NonNull public android.media.MediaCodec.QueueRequest setPresentationTimeUs(long);

    method @NonNull public android.media.MediaCodec.QueueRequest setStringParameter(@NonNull String, @NonNull String);

media/java/android/media/MediaCodec.java

+35 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import java.util.Collections; 
import java.util.HashMap;

import java.util.HashSet;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.LinkedBlockingQueue;
@@ -3048,16 +3049,47 @@ final public class MediaCodec { 
         * @param block The linear block object

         * @param offset The byte offset into the input buffer at which the data starts.

         * @param size The number of bytes of valid input data.

         * @param cryptoInfo Metadata describing the structure of the encrypted input sample.

         *                   may be null for non-encrypted content.

         * @return this object

         * @throws IllegalStateException if a buffer is already set

         */

        public @NonNull QueueRequest setLinearBlock(

                @NonNull LinearBlock block,

                int offset,

                int size) {

            if (!isAccessible()) {

                throw new IllegalStateException("The request is stale");

            }

            if (mLinearBlock != null || mHardwareBuffer != null) {

                throw new IllegalStateException("Cannot set block twice");

            }

            mLinearBlock = block;

            mOffset = offset;

            mSize = size;

            mCryptoInfo = null;

            return this;

        }



        /**

         * Set an encrypted linear block to this queue request. Exactly one buffer must be

         * set for a queue request before calling {@link #queue}. It is possible

         * to use the same {@link LinearBlock} object for multiple queue

         * requests. The behavior is undefined if the range of the buffer

         * overlaps for multiple requests, or the application writes into the

         * region being processed by the codec.

         *

         * @param block The linear block object

         * @param offset The byte offset into the input buffer at which the data starts.

         * @param size The number of bytes of valid input data.

         * @param cryptoInfo Metadata describing the structure of the encrypted input sample.

         * @return this object

         * @throws IllegalStateException if a buffer is already set

         */

        public @NonNull QueueRequest setEncryptedLinearBlock(

                @NonNull LinearBlock block,

                int offset,

                int size,

                @Nullable MediaCodec.CryptoInfo cryptoInfo) {

                @NonNull MediaCodec.CryptoInfo cryptoInfo) {

            Objects.requireNonNull(cryptoInfo);

            if (!isAccessible()) {

                throw new IllegalStateException("The request is stale");

            }