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

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

Merge "Expose video codec type in MediaMetadataRetriever"

parents e609b6bc 9fc0e109

api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ package android.media { 
    field public static final int FLAG_FROM_KEY = 4096; // 0x1000

  }



  public class MediaMetadataRetriever implements java.lang.AutoCloseable {

    field public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40; // 0x28

  }



  @Deprecated public final class MediaParceledListSlice<T extends android.os.Parcelable> implements android.os.Parcelable {

    ctor @Deprecated public MediaParceledListSlice(@NonNull java.util.List<T>);

    method @Deprecated public int describeContents();

media/java/android/media/MediaMetadataRetriever.java

+12 −1
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 


package android.media;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentResolver;

import android.content.Context;
@@ -1331,7 +1334,6 @@ public class MediaMetadataRetriever implements AutoCloseable { 
     * @see MediaFormat#COLOR_RANGE_FULL

     */

    public static final int METADATA_KEY_COLOR_RANGE    = 37;

    // Add more here...



    /**

     * This key retrieves the sample rate in Hz, if available.
@@ -1344,4 +1346,13 @@ public class MediaMetadataRetriever implements AutoCloseable { 
     * This is a signed 32-bit integer formatted as a string in base 10.

     */

    public static final int METADATA_KEY_BITS_PER_SAMPLE = 39;



    /**

     * This key retrieves the video codec mimetype if available.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40;



    // Add more here...

}

non-updatable-api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ package android.media { 
    field public static final int FLAG_FROM_KEY = 4096; // 0x1000

  }



  public class MediaMetadataRetriever implements java.lang.AutoCloseable {

    field public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40; // 0x28

  }



}



package android.media.session {