media: Add encapsulation info fields to AudioPortDeviceExt am: 2f91090767

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2455634

Change-Id: I7e17f2f7fc868774641766fc12d2417d9ebb12de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl b/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl
index 63136d7..a0bd801 100644
--- a/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl
+++ b/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl
@@ -37,6 +37,16 @@
      * hardware.
      */
     AudioFormatDescription[] encodedFormats;
+    /**
+     * Mask of supported encapsulation modes. Specified for ports that accept
+     * compressed data. The field is a bitmask indexed by AudioEncapsulationMode.
+     */
+    int encapsulationModes;
+    /**
+     * Mask of supported metadata types used for encapsulated compressed data.
+     * This field is a bitmask indexed by AudioEncapsulationMetadataType.
+     */
+    int encapsulationMetadataTypes;
 
     /**
      * A default device port is fallback used when the preference for the device
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl
index 37d7041..6633620 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl
@@ -38,5 +38,7 @@
   android.media.audio.common.AudioDevice device;
   int flags;
   android.media.audio.common.AudioFormatDescription[] encodedFormats;
+  int encapsulationModes;
+  int encapsulationMetadataTypes;
   const int FLAG_INDEX_DEFAULT_DEVICE = 0;
 }