commit c10572eff23c10893efb5d6e3a07f48527cfc1f2
author Mikhail Naganov <mnaganov@google.com> Fri May 21 17:42:02 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Fri May 21 17:42:02 2021 -0700
tree cc74a45b8bdacc06203342a90778974622ce72d8
parent b8d2b1db10a85aae3c9bb200b290722cdb6e43df

Remove dependency on android.media.audio.common.AudioFormat

In a preparation to converting audio HAL to SAIDL,
ensure that Framework SAIDL is self-contained and
has all the necessary types.

This creates a temporary duplication of types with
android.media.audio.common which will be fixed once
we stabilize the common types between the framework
and HALs.

Bug: 188932434
Test: m
Change-Id: Ib632c0ae5d2d1562266c87480b585b1b7f6e5ac6

media/libaudioclient/IAudioFlinger.cpp

diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index 0564cdf..b517588 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -238,7 +238,7 @@
 audio_format_t AudioFlingerClientAdapter::format(audio_io_handle_t output) const {
     auto result = [&]() -> ConversionResult<audio_format_t> {
         int32_t outputAidl = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(output));
-        media::audio::common::AudioFormat aidlRet;
+        media::AudioFormatSys aidlRet;
         RETURN_IF_ERROR(statusTFromBinderStatus(mDelegate->format(outputAidl, &aidlRet)));
         return aidl2legacy_AudioFormat_audio_format_t(aidlRet);
     }();
@@ -406,7 +406,7 @@
                                                      audio_channel_mask_t channelMask) const {
     auto result = [&]() -> ConversionResult<size_t> {
         int32_t sampleRateAidl = VALUE_OR_RETURN(convertIntegral<int32_t>(sampleRate));
-        media::audio::common::AudioFormat formatAidl = VALUE_OR_RETURN(
+        media::AudioFormatSys formatAidl = VALUE_OR_RETURN(
                 legacy2aidl_audio_format_t_AudioFormat(format));
         int32_t channelMaskAidl = VALUE_OR_RETURN(
                 legacy2aidl_audio_channel_mask_t_int32_t(channelMask));
@@ -798,7 +798,7 @@
 }
 
 Status AudioFlingerServerAdapter::format(int32_t output,
-                                         media::audio::common::AudioFormat* _aidl_return) {
+                                         media::AudioFormatSys* _aidl_return) {
     audio_io_handle_t outputLegacy = VALUE_OR_RETURN_BINDER(
             aidl2legacy_int32_t_audio_io_handle_t(output));
     *_aidl_return = VALUE_OR_RETURN_BINDER(
@@ -926,7 +926,7 @@
 }
 
 Status AudioFlingerServerAdapter::getInputBufferSize(int32_t sampleRate,
-                                                     media::audio::common::AudioFormat format,
+                                                     media::AudioFormatSys format,
                                                      int32_t channelMask, int64_t* _aidl_return) {
     uint32_t sampleRateLegacy = VALUE_OR_RETURN_BINDER(convertIntegral<uint32_t>(sampleRate));
     audio_format_t formatLegacy = VALUE_OR_RETURN_BINDER(