commit 020b0dc578cbc5779293e27311c23099996690e0
author jiabin <jiabin@google.com> Tue Nov 05 11:59:53 2019 -0800
committer jiabin <jiabin@google.com> Tue Dec 03 17:13:50 2019 -0800
tree 96804bc8b4b74591fe3721022335952445f41aaa
parent 5b78141fb60bb73ee9339497cce5b5111413927e

Use AudioDeviceTypeAddr in DeviceDescriptorBase.

AudioDeviceTypeAddr is moved to libaudiofoundation. In that case, it can
be used in DeviceDescriptorBase.

Bug: 135621476
Test: make, atest audiofoundation_parcelable_test
Test: play music, record audio
Change-Id: Ia66dce29c8fb9d25c40598d9bada6eb295313884
Merged-In: Ia66dce29c8fb9d25c40598d9bada6eb295313884

media/libaudiofoundation/DeviceDescriptorBase.cpp

diff --git a/media/libaudiofoundation/DeviceDescriptorBase.cpp b/media/libaudiofoundation/DeviceDescriptorBase.cpp
index 18fd184..8933002 100644
--- a/media/libaudiofoundation/DeviceDescriptorBase.cpp
+++ b/media/libaudiofoundation/DeviceDescriptorBase.cpp
@@ -27,11 +27,11 @@
 DeviceDescriptorBase::DeviceDescriptorBase(audio_devices_t type) :
     AudioPort("", AUDIO_PORT_TYPE_DEVICE,
               audio_is_output_device(type) ? AUDIO_PORT_ROLE_SINK :
-                                             AUDIO_PORT_ROLE_SOURCE),
-    mDeviceType(type)
+                                             AUDIO_PORT_ROLE_SOURCE)
 {
+    mDeviceTypeAddr.mType = type;
     if (audio_is_remote_submix_device(type)) {
-        mAddress = "0";
+        mDeviceTypeAddr.mAddress = "0";
     }
 }
 
@@ -55,22 +55,22 @@
 
     AudioPortConfig::toAudioPortConfig(dstConfig, srcConfig);
 
-    dstConfig->role = audio_is_output_device(mDeviceType) ?
+    dstConfig->role = audio_is_output_device(mDeviceTypeAddr.mType) ?
                         AUDIO_PORT_ROLE_SINK : AUDIO_PORT_ROLE_SOURCE;
     dstConfig->type = AUDIO_PORT_TYPE_DEVICE;
-    dstConfig->ext.device.type = mDeviceType;
+    dstConfig->ext.device.type = mDeviceTypeAddr.mType;
 
-    (void)audio_utils_strlcpy_zerofill(dstConfig->ext.device.address, mAddress.c_str());
+    (void)audio_utils_strlcpy_zerofill(dstConfig->ext.device.address, mDeviceTypeAddr.getAddress());
 }
 
 void DeviceDescriptorBase::toAudioPort(struct audio_port *port) const
 {
-    ALOGV("DeviceDescriptorBase::toAudioPort() handle %d type %08x", mId, mDeviceType);
+    ALOGV("DeviceDescriptorBase::toAudioPort() handle %d type %08x", mId, mDeviceTypeAddr.mType);
     AudioPort::toAudioPort(port);
     toAudioPortConfig(&port->active_config);
     port->id = mId;
-    port->ext.device.type = mDeviceType;
-    (void)audio_utils_strlcpy_zerofill(port->ext.device.address, mAddress.c_str());
+    port->ext.device.type = mDeviceTypeAddr.mType;
+    (void)audio_utils_strlcpy_zerofill(port->ext.device.address, mDeviceTypeAddr.getAddress());
 }
 
 void DeviceDescriptorBase::dump(std::string *dst, int spaces, int index,
@@ -86,10 +86,11 @@
     }
 
     dst->append(base::StringPrintf("%*s- type: %-48s\n",
-            spaces, "", ::android::toString(mDeviceType).c_str()));
+            spaces, "", ::android::toString(mDeviceTypeAddr.mType).c_str()));
 
-    if (mAddress.size() != 0) {
-        dst->append(base::StringPrintf("%*s- address: %-32s\n", spaces, "", mAddress.c_str()));
+    if (mDeviceTypeAddr.mAddress.size() != 0) {
+        dst->append(base::StringPrintf(
+                "%*s- address: %-32s\n", spaces, "", mDeviceTypeAddr.getAddress()));
     }
     AudioPort::dump(dst, spaces, verbose);
 }
@@ -97,15 +98,15 @@
 std::string DeviceDescriptorBase::toString() const
 {
     std::stringstream sstream;
-    sstream << "type:0x" << std::hex << type() << ",@:" << mAddress;
+    sstream << "type:0x" << std::hex << type() << ",@:" << mDeviceTypeAddr.mAddress;
     return sstream.str();
 }
 
 void DeviceDescriptorBase::log() const
 {
-    ALOGI("Device id:%d type:0x%08X:%s, addr:%s", mId,  mDeviceType,
-          ::android::toString(mDeviceType).c_str(),
-          mAddress.c_str());
+    ALOGI("Device id:%d type:0x%08X:%s, addr:%s", mId,  mDeviceTypeAddr.mType,
+          ::android::toString(mDeviceTypeAddr.mType).c_str(),
+          mDeviceTypeAddr.getAddress());
 
     AudioPort::log("  ");
 }
@@ -115,8 +116,7 @@
     return other != nullptr &&
            static_cast<const AudioPort*>(this)->equals(other) &&
            static_cast<const AudioPortConfig*>(this)->equals(other) &&
-           mAddress.compare(other->address()) == 0 &&
-           mDeviceType == other->type();
+           mDeviceTypeAddr.equals(other->mDeviceTypeAddr);
 }
 
 status_t DeviceDescriptorBase::writeToParcel(Parcel *parcel) const
@@ -124,8 +124,7 @@
     status_t status = NO_ERROR;
     if ((status = AudioPort::writeToParcel(parcel)) != NO_ERROR) return status;
     if ((status = AudioPortConfig::writeToParcel(parcel)) != NO_ERROR) return status;
-    if ((status = parcel->writeUtf8AsUtf16(mAddress)) != NO_ERROR) return status;
-    if ((status = parcel->writeUint32(mDeviceType)) != NO_ERROR) return status;
+    if ((status = parcel->writeParcelable(mDeviceTypeAddr)) != NO_ERROR) return status;
     return status;
 }
 
@@ -134,8 +133,7 @@
     status_t status = NO_ERROR;
     if ((status = AudioPort::readFromParcel(parcel)) != NO_ERROR) return status;
     if ((status = AudioPortConfig::readFromParcel(parcel)) != NO_ERROR) return status;
-    if ((status = parcel->readUtf8FromUtf16(&mAddress)) != NO_ERROR) return status;
-    if ((status = parcel->readUint32(&mDeviceType)) != NO_ERROR) return status;
+    if ((status = parcel->readParcelable(&mDeviceTypeAddr)) != NO_ERROR) return status;
     return status;
 }