Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev
am: eb8de29269
Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user