Merge "Update Dolby surround sound display names" (cc741083) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioFormat.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,7 @@ public final class AudioFormat implements Parcelable {
		ENCODING_AAC_LC,
		ENCODING_DOLBY_TRUEHD,
		ENCODING_E_AC3_JOC,
		ENCODING_AC4,
		};

		/** @hide */
		@@ -1093,7 +1094,8 @@ public final class AudioFormat implements Parcelable {
		ENCODING_DTS_HD,
		ENCODING_AAC_LC,
		ENCODING_DOLBY_TRUEHD,
		ENCODING_E_AC3_JOC }
		ENCODING_E_AC3_JOC,
		ENCODING_AC4 }
		)
		@Retention(RetentionPolicy.SOURCE)
		public @interface SurroundSoundEncoding {}
		@@ -1105,14 +1107,14 @@ public final class AudioFormat implements Parcelable {
		* It is just a default to use if an international name is not available.
		*
		* @param audioFormat a surround format
		* @return short default name for the format, eg. “AC3” for ENCODING_AC3.
		* @return short default name for the format.
		*/
		public static String toDisplayName(@SurroundSoundEncoding int audioFormat) {
		switch (audioFormat) {
		case ENCODING_AC3:
		return "Dolby Digital (AC3)";
		return "Dolby Digital";
		case ENCODING_E_AC3:
		return "Dolby Digital Plus (E_AC3)";
		return "Dolby Digital Plus";
		case ENCODING_DTS:
		return "DTS";
		case ENCODING_DTS_HD:
		@@ -1122,7 +1124,9 @@ public final class AudioFormat implements Parcelable {
		case ENCODING_DOLBY_TRUEHD:
		return "Dolby TrueHD";
		case ENCODING_E_AC3_JOC:
		return "Dolby Atmos";
		return "Dolby Atmos in Dolby Digital Plus";
		case ENCODING_AC4:
		return "Dolby AC-4";
		default:
		return "Unknown surround sound format";
		}