commit b9cf377c2b4b73f0574504e1e307fad8c8450bb7
author Dorin Drimus <dorindrimus@google.com> Mon Nov 14 16:28:33 2022 +0000
committer Dorin Drimus <dorindrimus@google.com> Fri Nov 18 13:37:58 2022 +0000
tree 557cf61fec8ecb9f1dd32c9aeb92f49a2aa581aa
parent b99b4cf29c550b43279b89f7da173d64f21a9d58

Group additional DTS encodings under the surround sound settings

DTS-MA is controlled by the DTS-HD setting.
DTS-UHD P1 and DTS-UHD P2 are under the DTS-UHD (aka DTS:X) setting.

Added also MEDIA_MIMETYPE_AUDIO_DTS_HD_MA, MEDIA_MIMETYPE_AUDIO_DTS_UHD_P1 and MEDIA_MIMETYPE_AUDIO_DTS_UHD_P2 to the MediaDefs.

Bug: 235469058
Change-Id: I10d46a4679ee81564b6e66ef8716827452078400
Test: N/A

media/libaudioclient/AidlConversion.cpp

diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index 6586e01..90d51fd 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -839,6 +839,15 @@
         {
             AUDIO_FORMAT_DTS_HD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_HD)
         },
+        {
+            AUDIO_FORMAT_DTS_HD_MA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_HD_MA)
+        },
+        {
+            AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD_P1)
+        },
+        {
+            AUDIO_FORMAT_DTS_UHD_P2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD_P2)
+        },
         // In the future, we would like to represent encapsulated bitstreams as
         // nested AudioFormatDescriptions. The legacy 'AUDIO_FORMAT_IEC61937' type doesn't
         // specify the format of the encapsulated bitstream.
@@ -1034,9 +1043,6 @@
             make_AudioFormatDescription(PcmType::INT_24_BIT, MEDIA_MIMETYPE_AUDIO_IEC60958)
         },
         {
-            AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD)
-        },
-        {
             AUDIO_FORMAT_DRA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DRA)
         },
         {