Move handling of flags of audio ports to libaudiofoundation
Since the flags of an audio port are part of its configuration,
they need to be visible to HAL. Thus, expose them in AudioPort/Config
classes from libaudiofoundation.
To simplify code, removed unneeded implementation of Parcelable
interface by AudioPort and DeviceDescriptorBase.
PolicyAudioPortConfig now doesn't have any fields on its own,
only inline methods.
Bug: 198812639
Test: atest audiofoundation_parcelable_test
Test: atest audiopolicy_tests
Change-Id: I68fd6d232b7e00462866cd6240089a48ad187279
diff --git a/media/libaudiofoundation/DeviceDescriptorBase.cpp b/media/libaudiofoundation/DeviceDescriptorBase.cpp
index b383db4..c8222e7 100644
--- a/media/libaudiofoundation/DeviceDescriptorBase.cpp
+++ b/media/libaudiofoundation/DeviceDescriptorBase.cpp
@@ -164,7 +164,7 @@
{
return other != nullptr &&
static_cast<const AudioPort*>(this)->equals(other) &&
- static_cast<const AudioPortConfig*>(this)->equals(other) &&
+ static_cast<const AudioPortConfig*>(this)->equals(other, useInputChannelMask()) &&
mDeviceTypeAddr.equals(other->mDeviceTypeAddr) &&
checkEqual(mEncodedFormats, other->mEncodedFormats);
}
@@ -183,14 +183,6 @@
return false;
}
-
-status_t DeviceDescriptorBase::writeToParcel(Parcel *parcel) const
-{
- media::AudioPort parcelable;
- return writeToParcelable(&parcelable)
- ?: parcelable.writeToParcel(parcel);
-}
-
status_t DeviceDescriptorBase::writeToParcelable(media::AudioPort* parcelable) const {
AudioPort::writeToParcelable(parcelable);
AudioPortConfig::writeToParcelable(&parcelable->hal.activeConfig, useInputChannelMask());
@@ -212,12 +204,6 @@
return OK;
}
-status_t DeviceDescriptorBase::readFromParcel(const Parcel *parcel) {
- media::AudioPort parcelable;
- return parcelable.readFromParcel(parcel)
- ?: readFromParcelable(parcelable);
-}
-
status_t DeviceDescriptorBase::readFromParcelable(const media::AudioPort& parcelable) {
if (parcelable.sys.type != media::AudioPortType::DEVICE) {
return BAD_VALUE;