diff options
| author | 2016-07-11 17:08:14 -0700 | |
|---|---|---|
| committer | 2016-07-11 17:08:14 -0700 | |
| commit | abda9c33e5168d82726cee67f04d83bf4c28a8b1 (patch) | |
| tree | 28ffe6090b40ab253627b394e3aead2a9a08f769 | |
| parent | 49c410bc48c47b636c239e6e3c590f77f1b7fd23 (diff) | |
Make Dolby TrueHD audio format public
Bug: 30024357
Change-Id: I4e8e8cde6e6c87c96e07e1828da0fad96c0f9e76
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index d5f36bdb081f..d3ee682370b9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19652,6 +19652,7 @@ package android.media { field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR; field public static final int ENCODING_AC3 = 5; // 0x5 field public static final int ENCODING_DEFAULT = 1; // 0x1 + field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe field public static final int ENCODING_DTS = 7; // 0x7 field public static final int ENCODING_DTS_HD = 8; // 0x8 field public static final int ENCODING_E_AC3 = 6; // 0x6 diff --git a/api/system-current.txt b/api/system-current.txt index 16c75cc5d747..13ad2d666dcb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21160,6 +21160,7 @@ package android.media { field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR; field public static final int ENCODING_AC3 = 5; // 0x5 field public static final int ENCODING_DEFAULT = 1; // 0x1 + field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe field public static final int ENCODING_DTS = 7; // 0x7 field public static final int ENCODING_DTS_HD = 8; // 0x8 field public static final int ENCODING_E_AC3 = 6; // 0x6 diff --git a/api/test-current.txt b/api/test-current.txt index 7fdbb6411ef4..c6359dd4d1e9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -19722,6 +19722,7 @@ package android.media { field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR; field public static final int ENCODING_AC3 = 5; // 0x5 field public static final int ENCODING_DEFAULT = 1; // 0x1 + field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe field public static final int ENCODING_DTS = 7; // 0x7 field public static final int ENCODING_DTS_HD = 8; // 0x8 field public static final int ENCODING_E_AC3 = 6; // 0x6 diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 7d5939c9720a..81cc93da2e6f 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -264,7 +264,6 @@ public final class AudioFormat implements Parcelable { */ public static final int ENCODING_IEC61937 = 13; /** Audio data format: DOLBY TRUEHD compressed - * @hide **/ public static final int ENCODING_DOLBY_TRUEHD = 14; |