Merge "AudioFormat: Add ENCODING_AC4_L4" into main (adb78e39) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -21310,6 +21310,7 @@ package android.media {
		field public static final int ENCODING_AAC_XHE = 16; // 0x10
		field public static final int ENCODING_AC3 = 5; // 0x5
		field public static final int ENCODING_AC4 = 17; // 0x11
		field @FlaggedApi("android.media.audio.dolby_ac4_level4_encoding_api") public static final int ENCODING_AC4_L4 = 32; // 0x20
		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

core/jni/android_media_AudioFormat.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#define ENCODING_DTS_HD_MA 29
		#define ENCODING_DTS_UHD_P2 30
		#define ENCODING_DSD 31
		#define ENCODING_AC4_L4 32

		#define ENCODING_INVALID 0
		#define ENCODING_DEFAULT 1
		@@ -95,6 +96,8 @@ static inline audio_format_t audioFormatToNative(int audioFormat)
		return AUDIO_FORMAT_AAC_XHE;
		case ENCODING_AC4:
		return AUDIO_FORMAT_AC4;
		case ENCODING_AC4_L4:
		return AUDIO_FORMAT_AC4_L4;
		case ENCODING_E_AC3_JOC:
		return AUDIO_FORMAT_E_AC3_JOC;
		case ENCODING_DEFAULT:
		@@ -177,6 +180,8 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat)
		return ENCODING_AAC_XHE;
		case AUDIO_FORMAT_AC4:
		return ENCODING_AC4;
		case AUDIO_FORMAT_AC4_L4:
		return ENCODING_AC4_L4;
		case AUDIO_FORMAT_E_AC3_JOC:
		return ENCODING_E_AC3_JOC;
		case AUDIO_FORMAT_MAT:

media/java/android/media/AudioFormat.java

+21 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.media;

		import static android.media.audio.Flags.FLAG_DOLBY_AC4_LEVEL4_ENCODING_API;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -309,7 +312,7 @@ public final class AudioFormat implements Parcelable {
		public static final int ENCODING_AAC_ELD = 15;
		/** Audio data format: AAC xHE compressed */
		public static final int ENCODING_AAC_XHE = 16;
		/** Audio data format: AC-4 sync frame transport format */
		/** Audio data format: AC-4 (levels 0-3) sync frame transport format */
		public static final int ENCODING_AC4 = 17;
		/** Audio data format: E-AC-3-JOC compressed
		* E-AC-3-JOC streams can be decoded by downstream devices supporting {@link #ENCODING_E_AC3}.
		@@ -375,6 +378,9 @@ public final class AudioFormat implements Parcelable {
		public static final int ENCODING_DTS_UHD_P2 = 30;
		/** Audio data format: Direct Stream Digital */
		public static final int ENCODING_DSD = 31;
		/** Audio data format: AC-4 level 4 sync frame transport format */
		@FlaggedApi(FLAG_DOLBY_AC4_LEVEL4_ENCODING_API)
		public static final int ENCODING_AC4_L4 = 32;

		/** @hide */
		public static String toLogFriendlyEncoding(int enc) {
		@@ -413,6 +419,8 @@ public final class AudioFormat implements Parcelable {
		return "ENCODING_AAC_XHE";
		case ENCODING_AC4:
		return "ENCODING_AC4";
		case ENCODING_AC4_L4:
		return "ENCODING_AC4_L4";
		case ENCODING_E_AC3_JOC:
		return "ENCODING_E_AC3_JOC";
		case ENCODING_DOLBY_MAT:
		@@ -823,6 +831,7 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_AAC_ELD:
		case ENCODING_AAC_XHE:
		case ENCODING_AC4:
		case ENCODING_AC4_L4:
		case ENCODING_E_AC3_JOC:
		case ENCODING_DOLBY_MAT:
		case ENCODING_OPUS:
		@@ -863,6 +872,7 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_AAC_ELD:
		case ENCODING_AAC_XHE:
		case ENCODING_AC4:
		case ENCODING_AC4_L4:
		case ENCODING_E_AC3_JOC:
		case ENCODING_DOLBY_MAT:
		case ENCODING_OPUS:
		@@ -908,6 +918,7 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_AAC_ELD:
		case ENCODING_AAC_XHE:
		case ENCODING_AC4:
		case ENCODING_AC4_L4:
		case ENCODING_E_AC3_JOC:
		case ENCODING_DOLBY_MAT:
		case ENCODING_OPUS:
		@@ -950,6 +961,7 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_AAC_ELD:
		case ENCODING_AAC_XHE:
		case ENCODING_AC4:
		case ENCODING_AC4_L4:
		case ENCODING_E_AC3_JOC:
		case ENCODING_DOLBY_MAT:
		case ENCODING_OPUS:
		@@ -1238,6 +1250,7 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_AAC_ELD:
		case ENCODING_AAC_XHE:
		case ENCODING_AC4:
		case ENCODING_AC4_L4:
		case ENCODING_E_AC3_JOC:
		case ENCODING_DOLBY_MAT:
		case ENCODING_OPUS:
		@@ -1468,6 +1481,7 @@ public final class AudioFormat implements Parcelable {
		ENCODING_AAC_ELD,
		ENCODING_AAC_XHE,
		ENCODING_AC4,
		ENCODING_AC4_L4,
		ENCODING_E_AC3_JOC,
		ENCODING_DOLBY_MAT,
		ENCODING_OPUS,
		@@ -1506,6 +1520,7 @@ public final class AudioFormat implements Parcelable {
		ENCODING_AAC_ELD,
		ENCODING_AAC_XHE,
		ENCODING_AC4,
		ENCODING_AC4_L4,
		ENCODING_E_AC3_JOC,
		ENCODING_DOLBY_MAT,
		ENCODING_OPUS,
		@@ -1533,6 +1548,7 @@ public final class AudioFormat implements Parcelable {
		ENCODING_AAC_LC,
		ENCODING_DOLBY_TRUEHD,
		ENCODING_AC4,
		ENCODING_AC4_L4,
		ENCODING_E_AC3_JOC,
		ENCODING_DOLBY_MAT,
		ENCODING_MPEGH_BL_L3,
		@@ -1554,6 +1570,7 @@ public final class AudioFormat implements Parcelable {
		ENCODING_AAC_LC,
		ENCODING_DOLBY_TRUEHD,
		ENCODING_AC4,
		ENCODING_AC4_L4,
		ENCODING_E_AC3_JOC,
		ENCODING_DOLBY_MAT,
		ENCODING_MPEGH_BL_L3,
		@@ -1592,7 +1609,9 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_DOLBY_TRUEHD:
		return "Dolby TrueHD";
		case ENCODING_AC4:
		return "Dolby AC-4";
		return "Dolby AC-4 levels 0-3";
		case ENCODING_AC4_L4:
		return "Dolby AC-4 level 4";
		case ENCODING_E_AC3_JOC:
		return "Dolby Atmos in Dolby Digital Plus";
		case ENCODING_DOLBY_MAT:

media/java/android/media/AudioSystem.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -542,6 +542,8 @@ public class AudioSystem
		return "AUDIO_FORMAT_AAC_LATM_HE_V2"; // (AAC_LATM \| AAC_SUB_HE_V2)
		case /* AUDIO_FORMAT_E_AC3_JOC */ 0xA000001:
		return "AUDIO_FORMAT_E_AC3_JOC"; // (E_AC3 \| E_AC3_SUB_JOC)
		case /* AUDIO_FORMAT_AC4_L4 */ 0x22000001:
		return "AUDIO_FORMAT_AC4_L4"; // (AC4 \| AC4_SUB_L4)
		case /* AUDIO_FORMAT_MAT_1_0 */ 0x24000001:
		return "AUDIO_FORMAT_MAT_1_0"; // (MAT \| MAT_SUB_1_0)
		case /* AUDIO_FORMAT_MAT_2_0 */ 0x24000002: