Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lajos Molnar
2016-03-03 16:14:24 +00:00
committed by Android (Google) Code Review
parent 64389e25ba 6ef0ac3278
commit 4ab9756906
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -20935,6 +20935,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";

1
api/system-current.txt
View File

@@ -22425,6 +22425,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";

1
api/test-current.txt
View File

@@ -20946,6 +20946,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";

15
media/java/android/media/MediaFormat.java
View File

@@ -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;
}