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
diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index 946ec17..d250440 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -394,17 +394,17 @@
}
ConversionResult<audio_format_t> aidl2legacy_AudioFormat_audio_format_t(
- media::audio::common::AudioFormat aidl) {
- // This relies on AudioFormat being kept in sync with audio_format_t.
- static_assert(sizeof(media::audio::common::AudioFormat) == sizeof(audio_format_t));
+ media::AudioFormatSys aidl) {
+ // This relies on AudioFormatSys being kept in sync with audio_format_t.
+ static_assert(sizeof(media::AudioFormatSys) == sizeof(audio_format_t));
return static_cast<audio_format_t>(aidl);
}
-ConversionResult<media::audio::common::AudioFormat> legacy2aidl_audio_format_t_AudioFormat(
+ConversionResult<media::AudioFormatSys> legacy2aidl_audio_format_t_AudioFormat(
audio_format_t legacy) {
- // This relies on AudioFormat being kept in sync with audio_format_t.
- static_assert(sizeof(media::audio::common::AudioFormat) == sizeof(audio_format_t));
- return static_cast<media::audio::common::AudioFormat>(legacy);
+ // This relies on AudioFormatSys being kept in sync with audio_format_t.
+ static_assert(sizeof(media::AudioFormatSys) == sizeof(audio_format_t));
+ return static_cast<media::AudioFormatSys>(legacy);
}
ConversionResult<audio_gain_mode_t> aidl2legacy_AudioGainMode_audio_gain_mode_t(media::AudioGainMode aidl) {