From 6ef0ac3278be02c2249170b862245692e5afa80d Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Fri, 26 Feb 2016 08:49:30 -0800 Subject: [PATCH] media: Add track ID format key Bug: 25684127 Change-Id: I574515c3c144f5cabe4f40d934d062de1dd20851 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + media/java/android/media/MediaFormat.java | 15 +++++++++++++++ 4 files changed, 18 insertions(+) diff --git a/api/current.txt b/api/current.txt index 13b50876e9583..cdc451cc0aa2a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20999,6 +20999,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 125071daa4001..ad0c237f0457b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22507,6 +22507,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"; diff --git a/api/test-current.txt b/api/test-current.txt index af4fddbce7bda..12c5e1eba9a47 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -21008,6 +21008,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 646ab4ef18046..a0e2481d4fdc4 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -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. + * + *

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. + *

+ * + * The associated value is an integer. + */ + public static final String KEY_TRACK_ID = "track-id"; + /* package private */ MediaFormat(Map map) { mMap = map; }