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

Commit 5e8dc2c8 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: refine MediaCodecInfo video PerformancePoints"

parents 94991188 d7400f7b

api/current.txt

+33 −36
Original line number Diff line number Diff line
@@ -24623,42 +24623,39 @@ package android.media { 
    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int);

    method public boolean covers(@NonNull android.media.MediaFormat);

    method public boolean covers(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint);

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_100;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_120;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_200;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_24;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_240;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_25;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_30;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_50;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_60;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_100;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_120;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_200;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_24;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_240;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_25;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_30;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_50;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_60;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_24;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_25;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_30;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_48;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_50;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_60;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_100;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_120;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_200;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_24;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_240;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_25;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_30;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_50;

    field public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_60;

    field public final int frameRate;

    field public final long macroBlockRate;

    field public final int macroBlocks;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_100;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_120;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_200;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_24;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_240;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_25;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_30;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_50;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint FHD_60;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_100;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_120;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_200;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_24;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_240;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_25;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_30;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_50;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint HD_60;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_24;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_25;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_30;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_48;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_50;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint SD_60;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_100;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_120;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_200;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_24;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_240;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_25;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_30;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_50;

    field @NonNull public static final android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint UHD_60;

  }















  public final class MediaCodecList {

























api/test-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -1077,6 +1077,14 @@ package android.media {













    method public android.media.BufferingParams.Builder setResumePlaybackMarkMs(int);















  }





























  public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint {













    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int, int, @NonNull android.util.Size);













    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint, @NonNull android.util.Size);













    method public int getMaxFrameRate();













    method public long getMaxMacroBlockRate();













    method public int getMaxMacroBlocks();













  }





























  public class MediaPlayer2 implements android.media.AudioRouting java.lang.AutoCloseable {















    method public android.media.MediaPlayer2.DrmInfo getDrmInfo(@NonNull android.media.DataSourceDesc);















    method public android.media.MediaDrm.KeyRequest getDrmKeyRequest(@NonNull android.media.DataSourceDesc, @Nullable byte[], @Nullable byte[], @Nullable String, int, @Nullable java.util.Map<java.lang.String,java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;

































media/java/android/media/MediaCodecInfo.java



+202
−42


























File changed.
Preview size limit exceeded, changes collapsed.