Merge changes from topics "dra", "dts_uhd" (6a1812c3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -19377,8 +19377,10 @@ package android.media {
		field public static final int ENCODING_DEFAULT = 1; // 0x1
		field public static final int ENCODING_DOLBY_MAT = 19; // 0x13
		field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe
		field public static final int ENCODING_DRA = 28; // 0x1c
		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_DTS_UHD = 27; // 0x1b
		field public static final int ENCODING_E_AC3 = 6; // 0x6
		field public static final int ENCODING_E_AC3_JOC = 18; // 0x12
		field public static final int ENCODING_IEC61937 = 13; // 0xd

core/jni/android_media_AudioFormat.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@
		#define ENCODING_MPEGH_BL_L4 24
		#define ENCODING_MPEGH_LC_L3 25
		#define ENCODING_MPEGH_LC_L4 26
		#define ENCODING_DTS_UHD 27
		#define ENCODING_DRA 28

		#define ENCODING_INVALID 0
		#define ENCODING_DEFAULT 1
		@@ -110,6 +112,10 @@ static inline audio_format_t audioFormatToNative(int audioFormat)
		return AUDIO_FORMAT_MPEGH_LC_L3;
		case ENCODING_MPEGH_LC_L4:
		return AUDIO_FORMAT_MPEGH_LC_L4;
		case ENCODING_DTS_UHD:
		return AUDIO_FORMAT_DTS_UHD;
		case ENCODING_DRA:
		return AUDIO_FORMAT_DRA;
		default:
		return AUDIO_FORMAT_INVALID;
		}
		@@ -179,6 +185,10 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat)
		return ENCODING_MPEGH_LC_L3;
		case AUDIO_FORMAT_MPEGH_LC_L4:
		return ENCODING_MPEGH_LC_L4;
		case AUDIO_FORMAT_DTS_UHD:
		return ENCODING_DTS_UHD;
		case AUDIO_FORMAT_DRA:
		return ENCODING_DRA;
		case AUDIO_FORMAT_DEFAULT:
		return ENCODING_DEFAULT;
		default:

media/java/android/media/AudioFormat.java

+30 −2

Original line number	Diff line number	Diff line
		@@ -324,6 +324,10 @@ public final class AudioFormat implements Parcelable {
		public static final int ENCODING_MPEGH_LC_L3 = 25;
		/** Audio data format: MPEG-H low complexity profile, level 4 */
		public static final int ENCODING_MPEGH_LC_L4 = 26;
		/** Audio data format: DTS UHD compressed */
		public static final int ENCODING_DTS_UHD = 27;
		/** Audio data format: DRA compressed */
		public static final int ENCODING_DRA = 28;

		/** @hide */
		public static String toLogFriendlyEncoding(int enc) {
		@@ -380,6 +384,10 @@ public final class AudioFormat implements Parcelable {
		return "ENCODING_MPEGH_LC_L3";
		case ENCODING_MPEGH_LC_L4:
		return "ENCODING_MPEGH_LC_L4";
		case ENCODING_DTS_UHD:
		return "ENCODING_DTS_UHD";
		case ENCODING_DRA:
		return "ENCODING_DRA";
		default :
		return "invalid encoding " + enc;
		}
		@@ -659,6 +667,8 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_MPEGH_BL_L4:
		case ENCODING_MPEGH_LC_L3:
		case ENCODING_MPEGH_LC_L4:
		case ENCODING_DTS_UHD:
		case ENCODING_DRA:
		return true;
		default:
		return false;
		@@ -694,6 +704,8 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_MPEGH_BL_L4:
		case ENCODING_MPEGH_LC_L3:
		case ENCODING_MPEGH_LC_L4:
		case ENCODING_DTS_UHD:
		case ENCODING_DRA:
		return true;
		default:
		return false;
		@@ -732,6 +744,8 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_MPEGH_BL_L4:
		case ENCODING_MPEGH_LC_L3:
		case ENCODING_MPEGH_LC_L4:
		case ENCODING_DTS_UHD:
		case ENCODING_DRA:
		return false;
		case ENCODING_INVALID:
		default:
		@@ -770,6 +784,8 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_MPEGH_BL_L4:
		case ENCODING_MPEGH_LC_L3:
		case ENCODING_MPEGH_LC_L4:
		case ENCODING_DTS_UHD:
		case ENCODING_DRA:
		return false;
		case ENCODING_INVALID:
		default:
		@@ -1056,6 +1072,8 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_MPEGH_BL_L4:
		case ENCODING_MPEGH_LC_L3:
		case ENCODING_MPEGH_LC_L4:
		case ENCODING_DTS_UHD:
		case ENCODING_DRA:
		mEncoding = encoding;
		break;
		case ENCODING_INVALID:
		@@ -1282,7 +1300,9 @@ public final class AudioFormat implements Parcelable {
		ENCODING_MPEGH_BL_L3,
		ENCODING_MPEGH_BL_L4,
		ENCODING_MPEGH_LC_L3,
		ENCODING_MPEGH_LC_L4 }
		ENCODING_MPEGH_LC_L4,
		ENCODING_DTS_UHD,
		ENCODING_DRA }
		)
		@Retention(RetentionPolicy.SOURCE)
		public @interface Encoding {}
		@@ -1302,6 +1322,8 @@ public final class AudioFormat implements Parcelable {
		ENCODING_MPEGH_BL_L4,
		ENCODING_MPEGH_LC_L3,
		ENCODING_MPEGH_LC_L4,
		ENCODING_DTS_UHD,
		ENCODING_DRA
		};

		/** @hide */
		@@ -1318,7 +1340,9 @@ public final class AudioFormat implements Parcelable {
		ENCODING_MPEGH_BL_L3,
		ENCODING_MPEGH_BL_L4,
		ENCODING_MPEGH_LC_L3,
		ENCODING_MPEGH_LC_L4 }
		ENCODING_MPEGH_LC_L4,
		ENCODING_DTS_UHD,
		ENCODING_DRA }
		)
		@Retention(RetentionPolicy.SOURCE)
		public @interface SurroundSoundEncoding {}
		@@ -1360,6 +1384,10 @@ public final class AudioFormat implements Parcelable {
		return "MPEG-H 3D Audio low complexity profile level 3";
		case ENCODING_MPEGH_LC_L4:
		return "MPEG-H 3D Audio low complexity profile level 4";
		case ENCODING_DTS_UHD:
		return "DTS UHD";
		case ENCODING_DRA:
		return "DRA";
		default:
		return "Unknown surround sound format";
		}

media/java/android/media/AudioSystem.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -424,6 +424,10 @@ public class AudioSystem
		return "AUDIO_FORMAT_MAT_2_0"; // (MAT \| MAT_SUB_2_0)
		case /* AUDIO_FORMAT_MAT_2_1 */ 0x24000003:
		return "AUDIO_FORMAT_MAT_2_1"; // (MAT \| MAT_SUB_2_1)
		case /* AUDIO_FORMAT_DTS_UHD */ 0x2E000000:
		return "AUDIO_FORMAT_DTS_UHD";
		case /* AUDIO_FORMAT_DRA */ 0x2F000000:
		return "AUDIO_FORMAT_DRA";
		default:
		return "AUDIO_FORMAT_(" + audioFormat + ")";
		}