Merge changes from topics "dra", "dts_uhd" am: 6a1812c30f am: ea8e392fef

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691214

Change-Id: I34f818f3140c8d5c6f21089bf168b6b836a61fbc

4 files changed, 25 insertions, 3 deletions

diff --git a/core/api/current.txt b/core/api/current.txt
index 97d7dba82006..2e7897599aa0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -19377,6 +19377,7 @@ 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
diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h
index 7fde92c94531..0e6b587db945 100644
--- a/core/jni/android_media_AudioFormat.h
+++ b/core/jni/android_media_AudioFormat.h
@@ -46,6 +46,7 @@
 #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
@@ -113,6 +114,8 @@ static inline audio_format_t audioFormatToNative(int audioFormat)
         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;
     }
@@ -184,6 +187,8 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat)
         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:
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index f2e8ee0f9053..bd2524f4b4b1 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -326,6 +326,8 @@ public final class AudioFormat implements Parcelable {
     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) {
@@ -384,6 +386,8 @@ public final class AudioFormat implements Parcelable {
                 return "ENCODING_MPEGH_LC_L4";
             case ENCODING_DTS_UHD:
                 return "ENCODING_DTS_UHD";
+            case ENCODING_DRA:
+                return "ENCODING_DRA";
             default :
                 return "invalid encoding " + enc;
         }
@@ -664,6 +668,7 @@ public final class AudioFormat implements Parcelable {
             case ENCODING_MPEGH_LC_L3:
             case ENCODING_MPEGH_LC_L4:
             case ENCODING_DTS_UHD:
+            case ENCODING_DRA:
                 return true;
             default:
                 return false;
@@ -700,6 +705,7 @@ public final class AudioFormat implements Parcelable {
             case ENCODING_MPEGH_LC_L3:
             case ENCODING_MPEGH_LC_L4:
             case ENCODING_DTS_UHD:
+            case ENCODING_DRA:
                 return true;
             default:
                 return false;
@@ -739,6 +745,7 @@ public final class AudioFormat implements Parcelable {
             case ENCODING_MPEGH_LC_L3:
             case ENCODING_MPEGH_LC_L4:
             case ENCODING_DTS_UHD:
+            case ENCODING_DRA:
                 return false;
             case ENCODING_INVALID:
             default:
@@ -778,6 +785,7 @@ public final class AudioFormat implements Parcelable {
             case ENCODING_MPEGH_LC_L3:
             case ENCODING_MPEGH_LC_L4:
             case ENCODING_DTS_UHD:
+            case ENCODING_DRA:
                 return false;
             case ENCODING_INVALID:
             default:
@@ -1065,6 +1073,7 @@ public final class AudioFormat implements Parcelable {
                 case ENCODING_MPEGH_LC_L3:
                 case ENCODING_MPEGH_LC_L4:
                 case ENCODING_DTS_UHD:
+                case ENCODING_DRA:
                     mEncoding = encoding;
                     break;
                 case ENCODING_INVALID:
@@ -1292,7 +1301,8 @@ public final class AudioFormat implements Parcelable {
         ENCODING_MPEGH_BL_L4,
         ENCODING_MPEGH_LC_L3,
         ENCODING_MPEGH_LC_L4,
-        ENCODING_DTS_UHD }
+        ENCODING_DTS_UHD,
+        ENCODING_DRA }
     )
     @Retention(RetentionPolicy.SOURCE)
     public @interface Encoding {}
@@ -1312,7 +1322,8 @@ public final class AudioFormat implements Parcelable {
             ENCODING_MPEGH_BL_L4,
             ENCODING_MPEGH_LC_L3,
             ENCODING_MPEGH_LC_L4,
-            ENCODING_DTS_UHD
+            ENCODING_DTS_UHD,
+            ENCODING_DRA
     };
 
     /** @hide */
@@ -1330,7 +1341,8 @@ public final class AudioFormat implements Parcelable {
             ENCODING_MPEGH_BL_L4,
             ENCODING_MPEGH_LC_L3,
             ENCODING_MPEGH_LC_L4,
-            ENCODING_DTS_UHD }
+            ENCODING_DTS_UHD,
+            ENCODING_DRA }
     )
     @Retention(RetentionPolicy.SOURCE)
     public @interface SurroundSoundEncoding {}
@@ -1374,6 +1386,8 @@ public final class AudioFormat implements Parcelable {
                 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";
         }
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index d2ba99f36783..8425185b90d0 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -426,6 +426,8 @@ public class AudioSystem
                 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 + ")";
         }