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

Commit 2eb03763 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media: Add track ID format key" into nyc-dev am: 4ab97569 

am: 03b81e80

* commit '03b81e80':
  media: Add track ID format key
parents b8dc5ab3 03b81e80

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20939,6 +20939,7 @@ package android.media { 
    field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";

    field public static final java.lang.String KEY_STRIDE = "stride";

    field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final java.lang.String KEY_TRACK_ID = "track-id";

    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22429,6 +22429,7 @@ package android.media { 
    field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";

    field public static final java.lang.String KEY_STRIDE = "stride";

    field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final java.lang.String KEY_TRACK_ID = "track-id";

    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20950,6 +20950,7 @@ package android.media { 
    field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";

    field public static final java.lang.String KEY_STRIDE = "stride";

    field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final java.lang.String KEY_TRACK_ID = "track-id";

    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

media/java/android/media/MediaFormat.java

+15 −0
Original line number Diff line number Diff line
@@ -644,6 +644,21 @@ public final class MediaFormat { 
    /** Full range. Y, Cr and Cb component values range from 0 to 255 for 8-bit content. */

    public static final int COLOR_RANGE_FULL = 1;



    /**

     * A key describing a unique ID for the content of a media track.

     *

     * <p>This key is used by {@link MediaExtractor}. Some extractors provide multiple encodings

     * of the same track (e.g. float audio tracks for FLAC and WAV may be expressed as two

     * tracks via MediaExtractor: a normal PCM track for backward compatibility, and a float PCM

     * track for added fidelity. Similarly, Dolby Vision extractor may provide a baseline SDR

     * version of a DV track.) This key can be used to identify which MediaExtractor tracks refer

     * to the same underlying content.

     * </p>

     *

     * The associated value is an integer.

     */

    public static final String KEY_TRACK_ID = "track-id";



    /* package private */ MediaFormat(Map<String, Object> map) {

        mMap = map;

    }