commit 05fcd3a1e1c20c7150be34fca1ece9b57269a216
author Michael Chan <michael.chan@dolby.com> Thu Jul 04 15:10:52 2024 +1000
committer Michael Chan <michael.chan@dolby.com> Thu Sep 26 07:28:27 2024 +1000
tree e9cee5891e306f15518fd53f7a5b31b924f58f46
parent cf622335cffa6c1bbd1f424b27ef1f1453b0cdb2

Add support for AC-4 level 4 audio format

Test: atest CtsMediaAudioTestCases:android.media.audio.cts.DolbyAudioFormatsTest
Bug: 266537650
Change-Id: I33d2a696096f2a74d067db70dde9a7f34b8abc5b

media/audioaidlconversion/AidlConversionCppNdk.cpp

diff --git a/media/audioaidlconversion/AidlConversionCppNdk.cpp b/media/audioaidlconversion/AidlConversionCppNdk.cpp
index 01b6e42..90996a3 100644
--- a/media/audioaidlconversion/AidlConversionCppNdk.cpp
+++ b/media/audioaidlconversion/AidlConversionCppNdk.cpp
@@ -741,6 +741,8 @@
             {// Note: not in the IANA registry.
              AUDIO_FORMAT_APTX_HD, make_AudioFormatDescription("audio/vnd.qcom.aptx.hd")},
             {AUDIO_FORMAT_AC4, make_AudioFormatDescription(::android::MEDIA_MIMETYPE_AUDIO_AC4)},
+            {AUDIO_FORMAT_AC4_L4, make_AudioFormatDescription(
+                    std::string(::android::MEDIA_MIMETYPE_AUDIO_AC4) + ";version=02.01.04")},
             {// Note: not in the IANA registry.
              AUDIO_FORMAT_LDAC, make_AudioFormatDescription("audio/vnd.sony.ldac")},
             {AUDIO_FORMAT_MAT,