From aa9811945f575614b3482d09e4d969792701cebb Mon Sep 17 00:00:00 2001
From: Paul McLean <pmclean@google.com>
Date: Sat, 21 Mar 2015 09:55:15 -0700
Subject: Adding explicit routing API to AudioTrack

Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
---
 .../managerdefinitions/include/AudioOutputDescriptor.h       |  1 +
 .../common/managerdefinitions/include/AudioPort.h            |  1 +
 .../common/managerdefinitions/include/DeviceDescriptor.h     |  1 +
 .../common/managerdefinitions/src/AudioOutputDescriptor.cpp  |  6 ++++++
 .../audiopolicy/common/managerdefinitions/src/AudioPort.cpp  |  4 ++++
 .../common/managerdefinitions/src/DeviceDescriptor.cpp       | 12 ++++++++++++
 6 files changed, 25 insertions(+)

(limited to 'services/audiopolicy/common/managerdefinitions')

diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h
index 43ee691..c3f584e 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h
@@ -36,6 +36,7 @@ public:
     AudioOutputDescriptor(const sp<IOProfile>& profile);
 
     status_t    dump(int fd);
+    void        log(const char* indent);
 
     audio_devices_t device() const;
     void changeRefCount(audio_stream_type_t stream, int delta);
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
index 4f7f2bc..16eac50 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
@@ -78,6 +78,7 @@ public:
     audio_module_handle_t getModuleHandle() const;
 
     void dump(int fd, int spaces) const;
+    void log(const char* indent) const;
 
     String8           mName;
     audio_port_type_t mType;
diff --git a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h
index d15f6b4..d6daacd 100644
--- a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h
+++ b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h
@@ -46,6 +46,7 @@ public:
 
     audio_devices_t type() const { return mDeviceType; }
     status_t dump(int fd, int spaces, int index) const;
+    void log() const;
 
     String8 mAddress;
     audio_port_handle_t mId;
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
index cdb5b51..7207a71 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -226,6 +226,12 @@ status_t AudioOutputDescriptor::dump(int fd)
     return NO_ERROR;
 }
 
+void AudioOutputDescriptor::log(const char* indent)
+{
+    ALOGI("%sID: %d,0x%X, [rt:%d fmt:0x%X ch:0x%X] hndl:%d",
+          indent, mId, mId, mSamplingRate, mFormat, mChannelMask, mIoHandle);
+}
+
 bool AudioOutputCollection::isStreamActive(audio_stream_type_t stream, uint32_t inPastMs) const
 {
     nsecs_t sysTime = systemTime();
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
index 46a119e..2bbcc05 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
@@ -694,6 +694,10 @@ void AudioPort::dump(int fd, int spaces) const
     }
 }
 
+void AudioPort::log(const char* indent) const
+{
+    ALOGI("%s Port[nm:%s, type:%d, role:%d]", indent, mName.string(), mType, mRole);
+}
 
 // --- AudioPortConfig class implementation
 
diff --git a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
index 7df7d75..9249d47 100644
--- a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
@@ -317,4 +317,16 @@ status_t DeviceDescriptor::dump(int fd, int spaces, int index) const
     return NO_ERROR;
 }
 
+void DeviceDescriptor::log() const
+{
+    ALOGI("Device id:%d type:0x%X:%s, addr:%s",
+          mId,
+          mDeviceType,
+          ConfigParsingUtils::enumToString(
+             sDeviceNameToEnumTable, ARRAY_SIZE(sDeviceNameToEnumTable), mDeviceType),
+          mAddress.string());
+
+    AudioPort::log("  ");
+}
+
 }; // namespace android
-- 
cgit v1.1