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/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp
index 7cadacd..5e054c5 100644
--- a/media/libaaudio/src/Android.bp
+++ b/media/libaaudio/src/Android.bp
@@ -248,7 +248,7 @@
"binding/aidl/aaudio/IAAudioService.aidl",
],
imports: [
- "android.media.audio.common.types",
+ "audioclient-types-aidl",
"shared-file-region-aidl",
"media_permission-aidl",
],
diff --git a/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp b/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
index 2d501ef..f28e0d6 100644
--- a/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
+++ b/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
@@ -27,7 +27,7 @@
using namespace aaudio;
-using android::media::audio::common::AudioFormat;
+using android::media::AudioFormatSys;
AAudioStreamConfiguration::AAudioStreamConfiguration(const StreamParameters& parcelable) {
setSamplesPerFrame(parcelable.samplesPerFrame);
@@ -69,7 +69,7 @@
static_assert(sizeof(aaudio_sharing_mode_t) == sizeof(result.sharingMode));
result.sharingMode = getSharingMode();
static_assert(sizeof(audio_format_t) == sizeof(result.audioFormat));
- result.audioFormat = static_cast<AudioFormat>(getFormat());
+ result.audioFormat = static_cast<AudioFormatSys>(getFormat());
static_assert(sizeof(aaudio_direction_t) == sizeof(result.direction));
result.direction = getDirection();
static_assert(sizeof(audio_usage_t) == sizeof(result.usage));
diff --git a/media/libaaudio/src/binding/aidl/aaudio/StreamParameters.aidl b/media/libaaudio/src/binding/aidl/aaudio/StreamParameters.aidl
index b7c4f70..d1ba9b3 100644
--- a/media/libaaudio/src/binding/aidl/aaudio/StreamParameters.aidl
+++ b/media/libaaudio/src/binding/aidl/aaudio/StreamParameters.aidl
@@ -16,14 +16,14 @@
package aaudio;
-import android.media.audio.common.AudioFormat;
+import android.media.AudioFormatSys;
parcelable StreamParameters {
int samplesPerFrame; // = AAUDIO_UNSPECIFIED;
int sampleRate; // = AAUDIO_UNSPECIFIED;
int deviceId; // = AAUDIO_UNSPECIFIED;
int /* aaudio_sharing_mode_t */ sharingMode; // = AAUDIO_SHARING_MODE_SHARED;
- AudioFormat audioFormat; // = AUDIO_FORMAT_DEFAULT;
+ AudioFormatSys audioFormat; // = AUDIO_FORMAT_DEFAULT;
int /* aaudio_direction_t */ direction; // = AAUDIO_DIRECTION_OUTPUT;
int /* aaudio_usage_t */ usage; // = AAUDIO_UNSPECIFIED;
int /* aaudio_content_type_t */ contentType; // = AAUDIO_UNSPECIFIED;