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

Commit 5f43ae30 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaCodec: address API review"

parents 23132a29 e0cc55ec

api/current.txt

+9 −4
Original line number Diff line number Diff line
@@ -25307,6 +25307,10 @@ package android.media { 
    method public void recycle();

  }













  public class MediaCodec.IncompatibleWithBlockModelException extends java.lang.RuntimeException {













    ctor public MediaCodec.IncompatibleWithBlockModelException();













  }



























  public static final class MediaCodec.LinearBlock {















    method protected void finalize();















    method public static boolean isCodecCopyFreeCompatible(@NonNull String[]);










@@ -25334,23 +25338,24 @@ package android.media {













  }





























  public static final class MediaCodec.OutputFrame {













    method public void getChangedKeys(@NonNull java.util.Set<java.lang.String>);















    method public int getFlags();















    method @NonNull public android.media.MediaFormat getFormat();















    method @Nullable public android.media.MediaCodec.GraphicBlock getGraphicBlock();















    method @Nullable public android.media.MediaCodec.LinearBlock getLinearBlock();















    method public long getPresentationTimeUs();













    method public void retrieveChangedKeys(@NonNull java.util.Set<java.lang.String>);















  }





























  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, @NonNull android.media.MediaCodec.CryptoInfo, long, int);













    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 setGraphicBlock(@NonNull android.media.MediaCodec.GraphicBlock, long, int);













    method @NonNull public android.media.MediaCodec.QueueRequest setGraphicBlock(@NonNull android.media.MediaCodec.GraphicBlock);















    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, long, 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 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



+119
−110


























File changed.
Preview size limit exceeded, changes collapsed.