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

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

Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev

parents ac74e16c a18b69f5

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14710,7 +14710,7 @@ package android.media { 














  public static final class MediaCodecInfo.CodecCapabilities {















    ctor public MediaCodecInfo.CodecCapabilities();













    method public static android.media.MediaCodecInfo.CodecCapabilities CreateFromProfileLevel(java.lang.String, int, int);













    method public static android.media.MediaCodecInfo.CodecCapabilities createFromProfileLevel(java.lang.String, int, int);















    method public android.media.MediaCodecInfo.AudioCapabilities getAudioCapabilities();















    method public android.media.MediaFormat getDefaultFormat();















    method public android.media.MediaCodecInfo.EncoderCapabilities getEncoderCapabilities();

























media/java/android/media/MediaCodecInfo.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -414,7 +414,7 @@ public final class MediaCodecInfo {













         * profile} and {@code level}.  If the type, or profile-level combination















         * is not understood by the framework, it returns null.















         */













        public static CodecCapabilities CreateFromProfileLevel(













        public static CodecCapabilities createFromProfileLevel(















                String mime, int profile, int level) {















            CodecProfileLevel pl = new CodecProfileLevel();















            pl.profile = profile;