Convert IAudioPolicyService to AIDL
Test: Audio tests from CtsMediaTests
Test: Audio smoke tests
Bug: 160253486
Change-Id: I5ecee56f71a959d2fd75714ba95d7653af0c98bc
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 2187635..5ce5974 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -19,6 +19,7 @@
#include <utils/Log.h>
+#include <android/media/IAudioPolicyService.h>
#include <android/media/BnCaptureStateListener.h>
#include <binder/IServiceManager.h>
#include <binder/ProcessState.h>
@@ -27,22 +28,30 @@
#include <media/AudioResamplerPublic.h>
#include <media/AudioSystem.h>
#include <media/IAudioFlinger.h>
-#include <media/IAudioPolicyService.h>
+#include <media/PolicyAidlConversion.h>
#include <media/TypeConverter.h>
#include <math.h>
#include <system/audio.h>
+#include <android/media/GetInputForAttrResponse.h>
#define VALUE_OR_RETURN_BINDER_STATUS(x) \
({ auto _tmp = (x); \
if (!_tmp.ok()) return aidl_utils::binderStatusFromStatusT(_tmp.error()); \
std::move(_tmp.value()); })
+#define RETURN_STATUS_IF_ERROR(x) \
+ { \
+ auto _tmp = (x); \
+ if (_tmp != OK) return _tmp; \
+ }
+
// ----------------------------------------------------------------------------
namespace android {
-
+using aidl_utils::statusTFromBinderStatus;
using binder::Status;
+using media::IAudioPolicyService;
// client singleton for AudioFlinger binder interface
Mutex AudioSystem::gLock;
@@ -57,12 +66,12 @@
// Required to be held while calling into gSoundTriggerCaptureStateListener.
class CaptureStateListenerImpl;
+
Mutex gSoundTriggerCaptureStateListenerLock;
sp<CaptureStateListenerImpl> gSoundTriggerCaptureStateListener = nullptr;
// establish binder interface to AudioFlinger service
-const sp<IAudioFlinger> AudioSystem::get_audio_flinger()
-{
+const sp<IAudioFlinger> AudioSystem::get_audio_flinger() {
sp<IAudioFlinger> af;
sp<AudioFlingerClient> afc;
bool reportNoError = false;
@@ -102,8 +111,7 @@
return af;
}
-const sp<AudioSystem::AudioFlingerClient> AudioSystem::getAudioFlingerClient()
-{
+const sp<AudioSystem::AudioFlingerClient> AudioSystem::getAudioFlingerClient() {
// calling get_audio_flinger() will initialize gAudioFlingerClient if needed
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return 0;
@@ -111,8 +119,7 @@
return gAudioFlingerClient;
}
-sp<AudioIoDescriptor> AudioSystem::getIoDescriptor(audio_io_handle_t ioHandle)
-{
+sp<AudioIoDescriptor> AudioSystem::getIoDescriptor(audio_io_handle_t ioHandle) {
sp<AudioIoDescriptor> desc;
const sp<AudioFlingerClient> afc = getAudioFlingerClient();
if (afc != 0) {
@@ -121,8 +128,7 @@
return desc;
}
-/* static */ status_t AudioSystem::checkAudioFlinger()
-{
+/* static */ status_t AudioSystem::checkAudioFlinger() {
if (defaultServiceManager()->checkService(String16("media.audio_flinger")) != 0) {
return NO_ERROR;
}
@@ -131,47 +137,41 @@
// FIXME Declare in binder opcode order, similarly to IAudioFlinger.h and IAudioFlinger.cpp
-status_t AudioSystem::muteMicrophone(bool state)
-{
+status_t AudioSystem::muteMicrophone(bool state) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setMicMute(state);
}
-status_t AudioSystem::isMicrophoneMuted(bool* state)
-{
+status_t AudioSystem::isMicrophoneMuted(bool* state) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
*state = af->getMicMute();
return NO_ERROR;
}
-status_t AudioSystem::setMasterVolume(float value)
-{
+status_t AudioSystem::setMasterVolume(float value) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
af->setMasterVolume(value);
return NO_ERROR;
}
-status_t AudioSystem::setMasterMute(bool mute)
-{
+status_t AudioSystem::setMasterMute(bool mute) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
af->setMasterMute(mute);
return NO_ERROR;
}
-status_t AudioSystem::getMasterVolume(float* volume)
-{
+status_t AudioSystem::getMasterVolume(float* volume) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
*volume = af->masterVolume();
return NO_ERROR;
}
-status_t AudioSystem::getMasterMute(bool* mute)
-{
+status_t AudioSystem::getMasterMute(bool* mute) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
*mute = af->masterMute();
@@ -179,8 +179,7 @@
}
status_t AudioSystem::setStreamVolume(audio_stream_type_t stream, float value,
- audio_io_handle_t output)
-{
+ audio_io_handle_t output) {
if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
@@ -188,8 +187,7 @@
return NO_ERROR;
}
-status_t AudioSystem::setStreamMute(audio_stream_type_t stream, bool mute)
-{
+status_t AudioSystem::setStreamMute(audio_stream_type_t stream, bool mute) {
if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
@@ -198,8 +196,7 @@
}
status_t AudioSystem::getStreamVolume(audio_stream_type_t stream, float* volume,
- audio_io_handle_t output)
-{
+ audio_io_handle_t output) {
if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
@@ -207,8 +204,7 @@
return NO_ERROR;
}
-status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute)
-{
+status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute) {
if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
@@ -216,23 +212,20 @@
return NO_ERROR;
}
-status_t AudioSystem::setMode(audio_mode_t mode)
-{
+status_t AudioSystem::setMode(audio_mode_t mode) {
if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE;
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setMode(mode);
}
-status_t AudioSystem::setParameters(audio_io_handle_t ioHandle, const String8& keyValuePairs)
-{
+status_t AudioSystem::setParameters(audio_io_handle_t ioHandle, const String8& keyValuePairs) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setParameters(ioHandle, keyValuePairs);
}
-String8 AudioSystem::getParameters(audio_io_handle_t ioHandle, const String8& keys)
-{
+String8 AudioSystem::getParameters(audio_io_handle_t ioHandle, const String8& keys) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
String8 result = String8("");
if (af == 0) return result;
@@ -241,13 +234,11 @@
return result;
}
-status_t AudioSystem::setParameters(const String8& keyValuePairs)
-{
+status_t AudioSystem::setParameters(const String8& keyValuePairs) {
return setParameters(AUDIO_IO_HANDLE_NONE, keyValuePairs);
}
-String8 AudioSystem::getParameters(const String8& keys)
-{
+String8 AudioSystem::getParameters(const String8& keys) {
return getParameters(AUDIO_IO_HANDLE_NONE, keys);
}
@@ -259,16 +250,14 @@
static const float dBConvert = -dBPerStep * 2.302585093f / 20.0f;
static const float dBConvertInverse = 1.0f / dBConvert;
-float AudioSystem::linearToLog(int volume)
-{
+float AudioSystem::linearToLog(int volume) {
// float v = volume ? exp(float(100 - volume) * dBConvert) : 0;
// ALOGD("linearToLog(%d)=%f", volume, v);
// return v;
return volume ? exp(float(100 - volume) * dBConvert) : 0;
}
-int AudioSystem::logToLinear(float volume)
-{
+int AudioSystem::logToLinear(float volume) {
// int v = volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;
// ALOGD("logTolinear(%d)=%f", v, volume);
// return v;
@@ -277,31 +266,30 @@
/* static */ size_t AudioSystem::calculateMinFrameCount(
uint32_t afLatencyMs, uint32_t afFrameCount, uint32_t afSampleRate,
- uint32_t sampleRate, float speed /*, uint32_t notificationsPerBufferReq*/)
-{
+ uint32_t sampleRate, float speed /*, uint32_t notificationsPerBufferReq*/) {
// Ensure that buffer depth covers at least audio hardware latency
uint32_t minBufCount = afLatencyMs / ((1000 * afFrameCount) / afSampleRate);
if (minBufCount < 2) {
minBufCount = 2;
}
#if 0
- // The notificationsPerBufferReq parameter is not yet used for non-fast tracks,
- // but keeping the code here to make it easier to add later.
- if (minBufCount < notificationsPerBufferReq) {
- minBufCount = notificationsPerBufferReq;
- }
+ // The notificationsPerBufferReq parameter is not yet used for non-fast tracks,
+ // but keeping the code here to make it easier to add later.
+ if (minBufCount < notificationsPerBufferReq) {
+ minBufCount = notificationsPerBufferReq;
+ }
#endif
ALOGV("calculateMinFrameCount afLatency %u afFrameCount %u afSampleRate %u "
- "sampleRate %u speed %f minBufCount: %u" /*" notificationsPerBufferReq %u"*/,
- afLatencyMs, afFrameCount, afSampleRate, sampleRate, speed, minBufCount
- /*, notificationsPerBufferReq*/);
+ "sampleRate %u speed %f minBufCount: %u" /*" notificationsPerBufferReq %u"*/,
+ afLatencyMs, afFrameCount, afSampleRate, sampleRate, speed, minBufCount
+ /*, notificationsPerBufferReq*/);
return minBufCount * sourceFramesNeededWithTimestretch(
sampleRate, afFrameCount, afSampleRate, speed);
}
-status_t AudioSystem::getOutputSamplingRate(uint32_t* samplingRate, audio_stream_type_t streamType)
-{
+status_t
+AudioSystem::getOutputSamplingRate(uint32_t* samplingRate, audio_stream_type_t streamType) {
audio_io_handle_t output;
if (streamType == AUDIO_STREAM_DEFAULT) {
@@ -317,8 +305,7 @@
}
status_t AudioSystem::getSamplingRate(audio_io_handle_t ioHandle,
- uint32_t* samplingRate)
-{
+ uint32_t* samplingRate) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
sp<AudioIoDescriptor> desc = getIoDescriptor(ioHandle);
@@ -337,8 +324,7 @@
return NO_ERROR;
}
-status_t AudioSystem::getOutputFrameCount(size_t* frameCount, audio_stream_type_t streamType)
-{
+status_t AudioSystem::getOutputFrameCount(size_t* frameCount, audio_stream_type_t streamType) {
audio_io_handle_t output;
if (streamType == AUDIO_STREAM_DEFAULT) {
@@ -354,8 +340,7 @@
}
status_t AudioSystem::getFrameCount(audio_io_handle_t ioHandle,
- size_t* frameCount)
-{
+ size_t* frameCount) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
sp<AudioIoDescriptor> desc = getIoDescriptor(ioHandle);
@@ -374,8 +359,7 @@
return NO_ERROR;
}
-status_t AudioSystem::getOutputLatency(uint32_t* latency, audio_stream_type_t streamType)
-{
+status_t AudioSystem::getOutputLatency(uint32_t* latency, audio_stream_type_t streamType) {
audio_io_handle_t output;
if (streamType == AUDIO_STREAM_DEFAULT) {
@@ -391,8 +375,7 @@
}
status_t AudioSystem::getLatency(audio_io_handle_t output,
- uint32_t* latency)
-{
+ uint32_t* latency) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
sp<AudioIoDescriptor> outputDesc = getIoDescriptor(output);
@@ -408,8 +391,7 @@
}
status_t AudioSystem::getInputBufferSize(uint32_t sampleRate, audio_format_t format,
- audio_channel_mask_t channelMask, size_t* buffSize)
-{
+ audio_channel_mask_t channelMask, size_t* buffSize) {
const sp<AudioFlingerClient> afc = getAudioFlingerClient();
if (afc == 0) {
return NO_INIT;
@@ -417,24 +399,21 @@
return afc->getInputBufferSize(sampleRate, format, channelMask, buffSize);
}
-status_t AudioSystem::setVoiceVolume(float value)
-{
+status_t AudioSystem::setVoiceVolume(float value) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setVoiceVolume(value);
}
-status_t AudioSystem::getRenderPosition(audio_io_handle_t output, uint32_t *halFrames,
- uint32_t *dspFrames)
-{
+status_t AudioSystem::getRenderPosition(audio_io_handle_t output, uint32_t* halFrames,
+ uint32_t* dspFrames) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->getRenderPosition(halFrames, dspFrames, output);
}
-uint32_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle)
-{
+uint32_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
uint32_t result = 0;
if (af == 0) return result;
@@ -444,47 +423,41 @@
return result;
}
-audio_unique_id_t AudioSystem::newAudioUniqueId(audio_unique_id_use_t use)
-{
+audio_unique_id_t AudioSystem::newAudioUniqueId(audio_unique_id_use_t use) {
// Must not use AF as IDs will re-roll on audioserver restart, b/130369529.
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return AUDIO_UNIQUE_ID_ALLOCATE;
return af->newAudioUniqueId(use);
}
-void AudioSystem::acquireAudioSessionId(audio_session_t audioSession, pid_t pid, uid_t uid)
-{
+void AudioSystem::acquireAudioSessionId(audio_session_t audioSession, pid_t pid, uid_t uid) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
af->acquireAudioSessionId(audioSession, pid, uid);
}
}
-void AudioSystem::releaseAudioSessionId(audio_session_t audioSession, pid_t pid)
-{
+void AudioSystem::releaseAudioSessionId(audio_session_t audioSession, pid_t pid) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
af->releaseAudioSessionId(audioSession, pid);
}
}
-audio_hw_sync_t AudioSystem::getAudioHwSyncForSession(audio_session_t sessionId)
-{
+audio_hw_sync_t AudioSystem::getAudioHwSyncForSession(audio_session_t sessionId) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return AUDIO_HW_SYNC_INVALID;
return af->getAudioHwSyncForSession(sessionId);
}
-status_t AudioSystem::systemReady()
-{
+status_t AudioSystem::systemReady() {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return NO_INIT;
return af->systemReady();
}
status_t AudioSystem::getFrameCountHAL(audio_io_handle_t ioHandle,
- size_t* frameCount)
-{
+ size_t* frameCount) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
sp<AudioIoDescriptor> desc = getIoDescriptor(ioHandle);
@@ -506,8 +479,7 @@
// ---------------------------------------------------------------------------
-void AudioSystem::AudioFlingerClient::clearIoCache()
-{
+void AudioSystem::AudioFlingerClient::clearIoCache() {
Mutex::Autolock _l(mLock);
mIoDescriptors.clear();
mInBuffSize = 0;
@@ -516,8 +488,7 @@
mInChannelMask = AUDIO_CHANNEL_NONE;
}
-void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who __unused)
-{
+void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who __unused) {
{
Mutex::Autolock _l(AudioSystem::gLock);
AudioSystem::gAudioFlinger.clear();
@@ -537,7 +508,8 @@
audio_io_config_event event = VALUE_OR_RETURN_BINDER_STATUS(
aidl2legacy_AudioIoConfigEvent_audio_io_config_event(_event));
sp<AudioIoDescriptor> ioDesc(
- VALUE_OR_RETURN_BINDER_STATUS(aidl2legacy_AudioIoDescriptor_AudioIoDescriptor(_ioDesc)));
+ VALUE_OR_RETURN_BINDER_STATUS(
+ aidl2legacy_AudioIoDescriptor_AudioIoDescriptor(_ioDesc)));
ALOGV("ioConfigChanged() event %d", event);
@@ -550,96 +522,102 @@
auto callbacks = std::map<audio_port_handle_t, wp<AudioDeviceCallback>>();
switch (event) {
- case AUDIO_OUTPUT_OPENED:
- case AUDIO_OUTPUT_REGISTERED:
- case AUDIO_INPUT_OPENED:
- case AUDIO_INPUT_REGISTERED: {
- sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
- if (oldDesc == 0) {
- mIoDescriptors.add(ioDesc->mIoHandle, ioDesc);
- } else {
+ case AUDIO_OUTPUT_OPENED:
+ case AUDIO_OUTPUT_REGISTERED:
+ case AUDIO_INPUT_OPENED:
+ case AUDIO_INPUT_REGISTERED: {
+ sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
+ if (oldDesc == 0) {
+ mIoDescriptors.add(ioDesc->mIoHandle, ioDesc);
+ } else {
+ deviceId = oldDesc->getDeviceId();
+ mIoDescriptors.replaceValueFor(ioDesc->mIoHandle, ioDesc);
+ }
+
+ if (ioDesc->getDeviceId() != AUDIO_PORT_HANDLE_NONE) {
+ deviceId = ioDesc->getDeviceId();
+ if (event == AUDIO_OUTPUT_OPENED || event == AUDIO_INPUT_OPENED) {
+ auto it = mAudioDeviceCallbacks.find(ioDesc->mIoHandle);
+ if (it != mAudioDeviceCallbacks.end()) {
+ callbacks = it->second;
+ }
+ }
+ }
+ ALOGV("ioConfigChanged() new %s %s %d samplingRate %u, format %#x channel mask %#x "
+ "frameCount %zu deviceId %d",
+ event == AUDIO_OUTPUT_OPENED || event == AUDIO_OUTPUT_REGISTERED ?
+ "output" : "input",
+ event == AUDIO_OUTPUT_OPENED || event == AUDIO_INPUT_OPENED ?
+ "opened" : "registered",
+ ioDesc->mIoHandle, ioDesc->mSamplingRate, ioDesc->mFormat,
+ ioDesc->mChannelMask,
+ ioDesc->mFrameCount, ioDesc->getDeviceId());
+ }
+ break;
+ case AUDIO_OUTPUT_CLOSED:
+ case AUDIO_INPUT_CLOSED: {
+ if (getIoDescriptor_l(ioDesc->mIoHandle) == 0) {
+ ALOGW("ioConfigChanged() closing unknown %s %d",
+ event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->mIoHandle);
+ break;
+ }
+ ALOGV("ioConfigChanged() %s %d closed",
+ event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->mIoHandle);
+
+ mIoDescriptors.removeItem(ioDesc->mIoHandle);
+ mAudioDeviceCallbacks.erase(ioDesc->mIoHandle);
+ }
+ break;
+
+ case AUDIO_OUTPUT_CONFIG_CHANGED:
+ case AUDIO_INPUT_CONFIG_CHANGED: {
+ sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
+ if (oldDesc == 0) {
+ ALOGW("ioConfigChanged() modifying unknown %s! %d",
+ event == AUDIO_OUTPUT_CONFIG_CHANGED ? "output" : "input",
+ ioDesc->mIoHandle);
+ break;
+ }
+
deviceId = oldDesc->getDeviceId();
mIoDescriptors.replaceValueFor(ioDesc->mIoHandle, ioDesc);
- }
- if (ioDesc->getDeviceId() != AUDIO_PORT_HANDLE_NONE) {
- deviceId = ioDesc->getDeviceId();
- if (event == AUDIO_OUTPUT_OPENED || event == AUDIO_INPUT_OPENED) {
+ if (deviceId != ioDesc->getDeviceId()) {
+ deviceId = ioDesc->getDeviceId();
auto it = mAudioDeviceCallbacks.find(ioDesc->mIoHandle);
if (it != mAudioDeviceCallbacks.end()) {
callbacks = it->second;
}
}
+ ALOGV("ioConfigChanged() new config for %s %d samplingRate %u, format %#x "
+ "channel mask %#x frameCount %zu frameCountHAL %zu deviceId %d",
+ event == AUDIO_OUTPUT_CONFIG_CHANGED ? "output" : "input",
+ ioDesc->mIoHandle, ioDesc->mSamplingRate, ioDesc->mFormat,
+ ioDesc->mChannelMask, ioDesc->mFrameCount, ioDesc->mFrameCountHAL,
+ ioDesc->getDeviceId());
+
}
- ALOGV("ioConfigChanged() new %s %s %d samplingRate %u, format %#x channel mask %#x "
- "frameCount %zu deviceId %d",
- event == AUDIO_OUTPUT_OPENED || event == AUDIO_OUTPUT_REGISTERED ?
- "output" : "input",
- event == AUDIO_OUTPUT_OPENED || event == AUDIO_INPUT_OPENED ?
- "opened" : "registered",
- ioDesc->mIoHandle, ioDesc->mSamplingRate, ioDesc->mFormat, ioDesc->mChannelMask,
- ioDesc->mFrameCount, ioDesc->getDeviceId());
- } break;
- case AUDIO_OUTPUT_CLOSED:
- case AUDIO_INPUT_CLOSED: {
- if (getIoDescriptor_l(ioDesc->mIoHandle) == 0) {
- ALOGW("ioConfigChanged() closing unknown %s %d",
- event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->mIoHandle);
break;
- }
- ALOGV("ioConfigChanged() %s %d closed",
- event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->mIoHandle);
-
- mIoDescriptors.removeItem(ioDesc->mIoHandle);
- mAudioDeviceCallbacks.erase(ioDesc->mIoHandle);
- } break;
-
- case AUDIO_OUTPUT_CONFIG_CHANGED:
- case AUDIO_INPUT_CONFIG_CHANGED: {
- sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
- if (oldDesc == 0) {
- ALOGW("ioConfigChanged() modifying unknown %s! %d",
- event == AUDIO_OUTPUT_CONFIG_CHANGED ? "output" : "input", ioDesc->mIoHandle);
- break;
- }
-
- deviceId = oldDesc->getDeviceId();
- mIoDescriptors.replaceValueFor(ioDesc->mIoHandle, ioDesc);
-
- if (deviceId != ioDesc->getDeviceId()) {
- deviceId = ioDesc->getDeviceId();
+ case AUDIO_CLIENT_STARTED: {
+ sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
+ if (oldDesc == 0) {
+ ALOGW("ioConfigChanged() start client on unknown io! %d", ioDesc->mIoHandle);
+ break;
+ }
+ ALOGV("ioConfigChanged() AUDIO_CLIENT_STARTED io %d port %d num callbacks %zu",
+ ioDesc->mIoHandle, ioDesc->mPortId, mAudioDeviceCallbacks.size());
+ oldDesc->mPatch = ioDesc->mPatch;
auto it = mAudioDeviceCallbacks.find(ioDesc->mIoHandle);
if (it != mAudioDeviceCallbacks.end()) {
- callbacks = it->second;
+ auto cbks = it->second;
+ auto it2 = cbks.find(ioDesc->mPortId);
+ if (it2 != cbks.end()) {
+ callbacks.emplace(ioDesc->mPortId, it2->second);
+ deviceId = oldDesc->getDeviceId();
+ }
}
}
- ALOGV("ioConfigChanged() new config for %s %d samplingRate %u, format %#x "
- "channel mask %#x frameCount %zu frameCountHAL %zu deviceId %d",
- event == AUDIO_OUTPUT_CONFIG_CHANGED ? "output" : "input",
- ioDesc->mIoHandle, ioDesc->mSamplingRate, ioDesc->mFormat,
- ioDesc->mChannelMask, ioDesc->mFrameCount, ioDesc->mFrameCountHAL,
- ioDesc->getDeviceId());
-
- } break;
- case AUDIO_CLIENT_STARTED: {
- sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->mIoHandle);
- if (oldDesc == 0) {
- ALOGW("ioConfigChanged() start client on unknown io! %d", ioDesc->mIoHandle);
break;
- }
- ALOGV("ioConfigChanged() AUDIO_CLIENT_STARTED io %d port %d num callbacks %zu",
- ioDesc->mIoHandle, ioDesc->mPortId, mAudioDeviceCallbacks.size());
- oldDesc->mPatch = ioDesc->mPatch;
- auto it = mAudioDeviceCallbacks.find(ioDesc->mIoHandle);
- if (it != mAudioDeviceCallbacks.end()) {
- auto cbks = it->second;
- auto it2 = cbks.find(ioDesc->mPortId);
- if (it2 != cbks.end()) {
- callbacks.emplace(ioDesc->mPortId, it2->second);
- deviceId = oldDesc->getDeviceId();
- }
- }
- } break;
}
for (auto wpCbk : callbacks) {
@@ -661,9 +639,8 @@
}
status_t AudioSystem::AudioFlingerClient::getInputBufferSize(
- uint32_t sampleRate, audio_format_t format,
- audio_channel_mask_t channelMask, size_t* buffSize)
-{
+ uint32_t sampleRate, audio_format_t format,
+ audio_channel_mask_t channelMask, size_t* buffSize) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) {
return PERMISSION_DENIED;
@@ -675,7 +652,7 @@
size_t inBuffSize = af->getInputBufferSize(sampleRate, format, channelMask);
if (inBuffSize == 0) {
ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %#x channelMask %#x",
- sampleRate, format, channelMask);
+ sampleRate, format, channelMask);
return BAD_VALUE;
}
// A benign race is possible here: we could overwrite a fresher cache entry
@@ -692,8 +669,8 @@
return NO_ERROR;
}
-sp<AudioIoDescriptor> AudioSystem::AudioFlingerClient::getIoDescriptor_l(audio_io_handle_t ioHandle)
-{
+sp<AudioIoDescriptor>
+AudioSystem::AudioFlingerClient::getIoDescriptor_l(audio_io_handle_t ioHandle) {
sp<AudioIoDescriptor> desc;
ssize_t index = mIoDescriptors.indexOfKey(ioHandle);
if (index >= 0) {
@@ -702,19 +679,19 @@
return desc;
}
-sp<AudioIoDescriptor> AudioSystem::AudioFlingerClient::getIoDescriptor(audio_io_handle_t ioHandle)
-{
+sp<AudioIoDescriptor> AudioSystem::AudioFlingerClient::getIoDescriptor(audio_io_handle_t ioHandle) {
Mutex::Autolock _l(mLock);
return getIoDescriptor_l(ioHandle);
}
status_t AudioSystem::AudioFlingerClient::addAudioDeviceCallback(
const wp<AudioDeviceCallback>& callback, audio_io_handle_t audioIo,
- audio_port_handle_t portId)
-{
+ audio_port_handle_t portId) {
ALOGV("%s audioIo %d portId %d", __func__, audioIo, portId);
Mutex::Autolock _l(mLock);
- auto& callbacks = mAudioDeviceCallbacks.emplace(audioIo, std::map<audio_port_handle_t, wp<AudioDeviceCallback>>()).first->second;
+ auto& callbacks = mAudioDeviceCallbacks.emplace(
+ audioIo,
+ std::map<audio_port_handle_t, wp<AudioDeviceCallback>>()).first->second;
auto result = callbacks.try_emplace(portId, callback);
if (!result.second) {
return INVALID_OPERATION;
@@ -724,8 +701,7 @@
status_t AudioSystem::AudioFlingerClient::removeAudioDeviceCallback(
const wp<AudioDeviceCallback>& callback __unused, audio_io_handle_t audioIo,
- audio_port_handle_t portId)
-{
+ audio_port_handle_t portId) {
ALOGV("%s audioIo %d portId %d", __func__, audioIo, portId);
Mutex::Autolock _l(mLock);
auto it = mAudioDeviceCallbacks.find(audioIo);
@@ -741,8 +717,7 @@
return NO_ERROR;
}
-/* static */ uintptr_t AudioSystem::addErrorCallback(audio_error_callback cb)
-{
+/* static */ uintptr_t AudioSystem::addErrorCallback(audio_error_callback cb) {
Mutex::Autolock _l(gLockErrorCallbacks);
gAudioErrorCallbacks.insert(cb);
return reinterpret_cast<uintptr_t>(cb);
@@ -756,24 +731,21 @@
/* static */ void AudioSystem::reportError(status_t err) {
Mutex::Autolock _l(gLockErrorCallbacks);
for (auto callback : gAudioErrorCallbacks) {
- callback(err);
+ callback(err);
}
}
-/*static*/ void AudioSystem::setDynPolicyCallback(dynamic_policy_callback cb)
-{
+/*static*/ void AudioSystem::setDynPolicyCallback(dynamic_policy_callback cb) {
Mutex::Autolock _l(gLock);
gDynPolicyCallback = cb;
}
-/*static*/ void AudioSystem::setRecordConfigCallback(record_config_callback cb)
-{
+/*static*/ void AudioSystem::setRecordConfigCallback(record_config_callback cb) {
Mutex::Autolock _l(gLock);
gRecordConfigCallback = cb;
}
-/*static*/ void AudioSystem::setRoutingCallback(routing_callback cb)
-{
+/*static*/ void AudioSystem::setRoutingCallback(routing_callback cb) {
Mutex::Autolock _l(gLock);
gRoutingCallback = cb;
}
@@ -785,8 +757,7 @@
// establish binder interface to AudioPolicy service
-const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service()
-{
+const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service() {
sp<IAudioPolicyService> ap;
sp<AudioPolicyServiceClient> apc;
{
@@ -826,8 +797,7 @@
// ---------------------------------------------------------------------------
-void AudioSystem::onNewAudioModulesAvailable()
-{
+void AudioSystem::onNewAudioModulesAvailable() {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return;
aps->onNewAudioModulesAvailable();
@@ -835,13 +805,12 @@
status_t AudioSystem::setDeviceConnectionState(audio_devices_t device,
audio_policy_dev_state_t state,
- const char *device_address,
- const char *device_name,
- audio_format_t encodedFormat)
-{
+ const char* device_address,
+ const char* device_name,
+ audio_format_t encodedFormat) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- const char *address = "";
- const char *name = "";
+ const char* address = "";
+ const char* name = "";
if (aps == 0) return PERMISSION_DENIED;
@@ -851,26 +820,46 @@
if (device_name != NULL) {
name = device_name;
}
- return aps->setDeviceConnectionState(device, state, address, name, encodedFormat);
+
+ media::AudioDevice deviceAidl;
+ deviceAidl.type = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ deviceAidl.address = address;
+
+ return statusTFromBinderStatus(
+ aps->setDeviceConnectionState(
+ deviceAidl,
+ VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_policy_dev_state_t_AudioPolicyDeviceState(state)),
+ name,
+ VALUE_OR_RETURN_STATUS(legacy2aidl_audio_format_t_AudioFormat(encodedFormat))));
}
audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t device,
- const char *device_address)
-{
+ const char* device_address) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE;
- return aps->getDeviceConnectionState(device, device_address);
+ auto result = [&]() -> ConversionResult<audio_policy_dev_state_t> {
+ media::AudioDevice deviceAidl;
+ deviceAidl.type = VALUE_OR_RETURN(legacy2aidl_audio_devices_t_int32_t(device));
+ deviceAidl.address = device_address;
+
+ media::AudioPolicyDeviceState result;
+ RETURN_IF_ERROR(statusTFromBinderStatus(
+ aps->getDeviceConnectionState(deviceAidl, &result)));
+
+ return aidl2legacy_AudioPolicyDeviceState_audio_policy_dev_state_t(result);
+ }();
+ return result.value_or(AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE);
}
status_t AudioSystem::handleDeviceConfigChange(audio_devices_t device,
- const char *device_address,
- const char *device_name,
- audio_format_t encodedFormat)
-{
+ const char* device_address,
+ const char* device_name,
+ audio_format_t encodedFormat) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- const char *address = "";
- const char *name = "";
+ const char* address = "";
+ const char* name = "";
if (aps == 0) return PERMISSION_DENIED;
@@ -880,294 +869,533 @@
if (device_name != NULL) {
name = device_name;
}
- return aps->handleDeviceConfigChange(device, address, name, encodedFormat);
+
+ media::AudioDevice deviceAidl;
+ deviceAidl.type = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ deviceAidl.address = address;
+
+ return statusTFromBinderStatus(
+ aps->handleDeviceConfigChange(deviceAidl, name, VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_format_t_AudioFormat(encodedFormat))));
}
-status_t AudioSystem::setPhoneState(audio_mode_t state, uid_t uid)
-{
+status_t AudioSystem::setPhoneState(audio_mode_t state, uid_t uid) {
if (uint32_t(state) >= AUDIO_MODE_CNT) return BAD_VALUE;
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setPhoneState(state, uid);
+ return statusTFromBinderStatus(aps->setPhoneState(
+ VALUE_OR_RETURN_STATUS(legacy2aidl_audio_mode_t_AudioMode(state)),
+ VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid))));
}
-status_t AudioSystem::setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config)
-{
+status_t
+AudioSystem::setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setForceUse(usage, config);
+
+ return statusTFromBinderStatus(
+ aps->setForceUse(
+ VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(usage)),
+ VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_policy_forced_cfg_t_AudioPolicyForcedConfig(
+ config))));
}
-audio_policy_forced_cfg_t AudioSystem::getForceUse(audio_policy_force_use_t usage)
-{
+audio_policy_forced_cfg_t AudioSystem::getForceUse(audio_policy_force_use_t usage) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return AUDIO_POLICY_FORCE_NONE;
- return aps->getForceUse(usage);
+
+ auto result = [&]() -> ConversionResult<audio_policy_forced_cfg_t> {
+ media::AudioPolicyForceUse usageAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(usage));
+ media::AudioPolicyForcedConfig configAidl;
+ RETURN_IF_ERROR(statusTFromBinderStatus(
+ aps->getForceUse(usageAidl, &configAidl)));
+ return aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(configAidl);
+ }();
+
+ return result.value_or(AUDIO_POLICY_FORCE_NONE);
}
-audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream)
-{
+audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) return 0;
- return aps->getOutput(stream);
+ if (aps == 0) return AUDIO_IO_HANDLE_NONE;
+
+ auto result = [&]() -> ConversionResult<audio_io_handle_t> {
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t outputAidl;
+ RETURN_IF_ERROR(
+ statusTFromBinderStatus(aps->getOutput(streamAidl, &outputAidl)));
+ return aidl2legacy_int32_t_audio_io_handle_t(outputAidl);
+ }();
+
+ return result.value_or(AUDIO_IO_HANDLE_NONE);
}
-status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr,
- audio_io_handle_t *output,
- audio_session_t session,
- audio_stream_type_t *stream,
- pid_t pid,
- uid_t uid,
- const audio_config_t *config,
- audio_output_flags_t flags,
- audio_port_handle_t *selectedDeviceId,
- audio_port_handle_t *portId,
- std::vector<audio_io_handle_t> *secondaryOutputs)
-{
+status_t AudioSystem::getOutputForAttr(audio_attributes_t* attr,
+ audio_io_handle_t* output,
+ audio_session_t session,
+ audio_stream_type_t* stream,
+ pid_t pid,
+ uid_t uid,
+ const audio_config_t* config,
+ audio_output_flags_t flags,
+ audio_port_handle_t* selectedDeviceId,
+ audio_port_handle_t* portId,
+ std::vector<audio_io_handle_t>* secondaryOutputs) {
+ if (attr == nullptr) {
+ ALOGE("%s NULL audio attributes", __func__);
+ return BAD_VALUE;
+ }
+ if (output == nullptr) {
+ ALOGE("%s NULL output - shouldn't happen", __func__);
+ return BAD_VALUE;
+ }
+ if (selectedDeviceId == nullptr) {
+ ALOGE("%s NULL selectedDeviceId - shouldn't happen", __func__);
+ return BAD_VALUE;
+ }
+ if (portId == nullptr) {
+ ALOGE("%s NULL portId - shouldn't happen", __func__);
+ return BAD_VALUE;
+ }
+ if (secondaryOutputs == nullptr) {
+ ALOGE("%s NULL secondaryOutputs - shouldn't happen", __func__);
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return NO_INIT;
- return aps->getOutputForAttr(attr, output, session, stream, pid, uid,
- config,
- flags, selectedDeviceId, portId, secondaryOutputs);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attr));
+ int32_t sessionAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_session_t_int32_t(session));
+ int32_t pidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(pid));
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ media::AudioConfig configAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_config_t_AudioConfig(*config));
+ int32_t flagsAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_output_flags_t_int32_t_mask(flags));
+
+ media::GetOutputForAttrResponse responseAidl;
+
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getOutputForAttr(attrAidl, sessionAidl, pidAidl, uidAidl, configAidl, flagsAidl,
+ &responseAidl)));
+
+ *output = VALUE_OR_RETURN_STATUS(
+ aidl2legacy_int32_t_audio_io_handle_t(responseAidl.output));
+
+ if (stream != nullptr) {
+ *stream = VALUE_OR_RETURN_STATUS(
+ aidl2legacy_AudioStreamType_audio_stream_type_t(responseAidl.stream));
+ }
+ *selectedDeviceId = VALUE_OR_RETURN_STATUS(
+ aidl2legacy_int32_t_audio_port_handle_t(responseAidl.selectedDeviceId));
+ *portId = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_port_handle_t(responseAidl.portId));
+ *secondaryOutputs = VALUE_OR_RETURN_STATUS(convertContainer<std::vector<audio_io_handle_t>>(
+ responseAidl.secondaryOutputs, aidl2legacy_int32_t_audio_io_handle_t));
+
+ return OK;
}
-status_t AudioSystem::startOutput(audio_port_handle_t portId)
-{
+status_t AudioSystem::startOutput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->startOutput(portId);
+
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(portId));
+ return statusTFromBinderStatus(aps->startOutput(portIdAidl));
}
-status_t AudioSystem::stopOutput(audio_port_handle_t portId)
-{
+status_t AudioSystem::stopOutput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->stopOutput(portId);
+
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(portId));
+ return statusTFromBinderStatus(aps->stopOutput(portIdAidl));
}
-void AudioSystem::releaseOutput(audio_port_handle_t portId)
-{
+void AudioSystem::releaseOutput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return;
- aps->releaseOutput(portId);
+
+ auto status = [&]() -> status_t {
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_handle_t_int32_t(portId));
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(aps->releaseOutput(portIdAidl)));
+ return OK;
+ }();
+
+ // Ignore status.
+ (void) status;
}
-status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr,
- audio_io_handle_t *input,
- audio_unique_id_t riid,
- audio_session_t session,
- pid_t pid,
- uid_t uid,
- const String16& opPackageName,
- const audio_config_base_t *config,
- audio_input_flags_t flags,
- audio_port_handle_t *selectedDeviceId,
- audio_port_handle_t *portId)
-{
+status_t AudioSystem::getInputForAttr(const audio_attributes_t* attr,
+ audio_io_handle_t* input,
+ audio_unique_id_t riid,
+ audio_session_t session,
+ pid_t pid,
+ uid_t uid,
+ const String16& opPackageName,
+ const audio_config_base_t* config,
+ audio_input_flags_t flags,
+ audio_port_handle_t* selectedDeviceId,
+ audio_port_handle_t* portId) {
+ if (attr == NULL) {
+ ALOGE("getInputForAttr NULL attr - shouldn't happen");
+ return BAD_VALUE;
+ }
+ if (input == NULL) {
+ ALOGE("getInputForAttr NULL input - shouldn't happen");
+ return BAD_VALUE;
+ }
+ if (selectedDeviceId == NULL) {
+ ALOGE("getInputForAttr NULL selectedDeviceId - shouldn't happen");
+ return BAD_VALUE;
+ }
+ if (portId == NULL) {
+ ALOGE("getInputForAttr NULL portId - shouldn't happen");
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return NO_INIT;
- return aps->getInputForAttr(
- attr, input, riid, session, pid, uid, opPackageName,
- config, flags, selectedDeviceId, portId);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attr));
+ int32_t inputAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(*input));
+ int32_t riidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_unique_id_t_int32_t(riid));
+ int32_t sessionAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_session_t_int32_t(session));
+ int32_t pidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(pid));
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ std::string opPackageNameAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_String16_string(opPackageName));
+ media::AudioConfigBase configAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_config_base_t_AudioConfigBase(*config));
+ int32_t flagsAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_input_flags_t_int32_t_mask(flags));
+
+ media::GetInputForAttrResponse response;
+
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getInputForAttr(attrAidl, inputAidl, riidAidl, sessionAidl, pidAidl, uidAidl,
+ opPackageNameAidl, configAidl, flagsAidl, &response)));
+
+ *input = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_io_handle_t(response.input));
+ *selectedDeviceId = VALUE_OR_RETURN_STATUS(
+ aidl2legacy_int32_t_audio_port_handle_t(response.selectedDeviceId));
+ *portId = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_port_handle_t(response.portId));
+
+ return OK;
}
-status_t AudioSystem::startInput(audio_port_handle_t portId)
-{
+status_t AudioSystem::startInput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->startInput(portId);
+
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(portId));
+ return statusTFromBinderStatus(aps->startInput(portIdAidl));
}
-status_t AudioSystem::stopInput(audio_port_handle_t portId)
-{
+status_t AudioSystem::stopInput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->stopInput(portId);
+
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(portId));
+ return statusTFromBinderStatus(aps->stopInput(portIdAidl));
}
-void AudioSystem::releaseInput(audio_port_handle_t portId)
-{
+void AudioSystem::releaseInput(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return;
- aps->releaseInput(portId);
+
+ auto status = [&]() -> status_t {
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_handle_t_int32_t(portId));
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(aps->releaseInput(portIdAidl)));
+ return OK;
+ }();
+
+ // Ignore status.
+ (void) status;
}
status_t AudioSystem::initStreamVolume(audio_stream_type_t stream,
- int indexMin,
- int indexMax)
-{
+ int indexMin,
+ int indexMax) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->initStreamVolume(stream, indexMin, indexMax);
+
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t indexMinAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(indexMin));
+ int32_t indexMaxAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(indexMax));
+ return statusTFromBinderStatus(
+ aps->initStreamVolume(streamAidl, indexMinAidl, indexMaxAidl));
}
status_t AudioSystem::setStreamVolumeIndex(audio_stream_type_t stream,
int index,
- audio_devices_t device)
-{
+ audio_devices_t device) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setStreamVolumeIndex(stream, index, device);
+
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t indexAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(index));
+ int32_t deviceAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ return statusTFromBinderStatus(
+ aps->setStreamVolumeIndex(streamAidl, deviceAidl, indexAidl));
}
status_t AudioSystem::getStreamVolumeIndex(audio_stream_type_t stream,
- int *index,
- audio_devices_t device)
-{
+ int* index,
+ audio_devices_t device) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getStreamVolumeIndex(stream, index, device);
+
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t deviceAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ int32_t indexAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getStreamVolumeIndex(streamAidl, deviceAidl, &indexAidl)));
+ if (index != nullptr) {
+ *index = VALUE_OR_RETURN_STATUS(convertIntegral<int>(indexAidl));
+ }
+ return OK;
}
-status_t AudioSystem::setVolumeIndexForAttributes(const audio_attributes_t &attr,
+status_t AudioSystem::setVolumeIndexForAttributes(const audio_attributes_t& attr,
int index,
- audio_devices_t device)
-{
+ audio_devices_t device) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setVolumeIndexForAttributes(attr, index, device);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
+ int32_t indexAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(index));
+ int32_t deviceAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ return statusTFromBinderStatus(
+ aps->setVolumeIndexForAttributes(attrAidl, deviceAidl, indexAidl));
}
-status_t AudioSystem::getVolumeIndexForAttributes(const audio_attributes_t &attr,
- int &index,
- audio_devices_t device)
-{
+status_t AudioSystem::getVolumeIndexForAttributes(const audio_attributes_t& attr,
+ int& index,
+ audio_devices_t device) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getVolumeIndexForAttributes(attr, index, device);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
+ int32_t deviceAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));
+ int32_t indexAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getVolumeIndexForAttributes(attrAidl, deviceAidl, &indexAidl)));
+ index = VALUE_OR_RETURN_STATUS(convertIntegral<int>(indexAidl));
+ return OK;
}
-status_t AudioSystem::getMaxVolumeIndexForAttributes(const audio_attributes_t &attr, int &index)
-{
+status_t AudioSystem::getMaxVolumeIndexForAttributes(const audio_attributes_t& attr, int& index) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getMaxVolumeIndexForAttributes(attr, index);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
+ int32_t indexAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getMaxVolumeIndexForAttributes(attrAidl, &indexAidl)));
+ index = VALUE_OR_RETURN_STATUS(convertIntegral<int>(indexAidl));
+ return OK;
}
-status_t AudioSystem::getMinVolumeIndexForAttributes(const audio_attributes_t &attr, int &index)
-{
+status_t AudioSystem::getMinVolumeIndexForAttributes(const audio_attributes_t& attr, int& index) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getMinVolumeIndexForAttributes(attr, index);
+
+ media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
+ int32_t indexAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getMinVolumeIndexForAttributes(attrAidl, &indexAidl)));
+ index = VALUE_OR_RETURN_STATUS(convertIntegral<int>(indexAidl));
+ return OK;
}
-uint32_t AudioSystem::getStrategyForStream(audio_stream_type_t stream)
-{
+product_strategy_t AudioSystem::getStrategyForStream(audio_stream_type_t stream) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PRODUCT_STRATEGY_NONE;
- return aps->getStrategyForStream(stream);
+
+ auto result = [&]() -> ConversionResult<product_strategy_t> {
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t resultAidl;
+ RETURN_IF_ERROR(statusTFromBinderStatus(
+ aps->getStrategyForStream(streamAidl, &resultAidl)));
+ return aidl2legacy_int32_t_product_strategy_t(resultAidl);
+ }();
+ return result.value_or(PRODUCT_STRATEGY_NONE);
}
-audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream)
-{
+audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return AUDIO_DEVICE_NONE;
- return aps->getDevicesForStream(stream);
+
+ auto result = [&]() -> ConversionResult<audio_devices_t> {
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t resultAidl;
+ RETURN_IF_ERROR(statusTFromBinderStatus(
+ aps->getDevicesForStream(streamAidl, &resultAidl)));
+ return aidl2legacy_int32_t_audio_devices_t(resultAidl);
+ }();
+ return result.value_or(AUDIO_DEVICE_NONE);
}
-status_t AudioSystem::getDevicesForAttributes(const AudioAttributes &aa,
- AudioDeviceTypeAddrVector *devices) {
+status_t AudioSystem::getDevicesForAttributes(const AudioAttributes& aa,
+ AudioDeviceTypeAddrVector* devices) {
if (devices == nullptr) {
return BAD_VALUE;
}
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getDevicesForAttributes(aa, devices);
+
+ media::AudioAttributesEx aaAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_AudioAttributes_AudioAttributesEx(aa));
+ std::vector<media::AudioDevice> retAidl;
+ RETURN_STATUS_IF_ERROR(
+ statusTFromBinderStatus(aps->getDevicesForAttributes(aaAidl, &retAidl)));
+ *devices = VALUE_OR_RETURN_STATUS(
+ convertContainer<AudioDeviceTypeAddrVector>(
+ retAidl,
+ aidl2legacy_AudioDeviceTypeAddress));
+ return OK;
}
-audio_io_handle_t AudioSystem::getOutputForEffect(const effect_descriptor_t *desc)
-{
+audio_io_handle_t AudioSystem::getOutputForEffect(const effect_descriptor_t* desc) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
// FIXME change return type to status_t, and return PERMISSION_DENIED here
if (aps == 0) return AUDIO_IO_HANDLE_NONE;
- return aps->getOutputForEffect(desc);
+
+ auto result = [&]() -> ConversionResult<audio_io_handle_t> {
+ media::EffectDescriptor descAidl = VALUE_OR_RETURN(
+ legacy2aidl_effect_descriptor_t_EffectDescriptor(*desc));
+ int32_t retAidl;
+ RETURN_IF_ERROR(
+ statusTFromBinderStatus(aps->getOutputForEffect(descAidl, &retAidl)));
+ return aidl2legacy_int32_t_audio_io_handle_t(retAidl);
+ }();
+
+ return result.value_or(AUDIO_IO_HANDLE_NONE);
}
-status_t AudioSystem::registerEffect(const effect_descriptor_t *desc,
- audio_io_handle_t io,
- uint32_t strategy,
- audio_session_t session,
- int id)
-{
+status_t AudioSystem::registerEffect(const effect_descriptor_t* desc,
+ audio_io_handle_t io,
+ product_strategy_t strategy,
+ audio_session_t session,
+ int id) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->registerEffect(desc, io, strategy, session, id);
+
+ media::EffectDescriptor descAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_effect_descriptor_t_EffectDescriptor(*desc));
+ int32_t ioAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(io));
+ int32_t strategyAidl = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_product_strategy_t(strategy));
+ int32_t sessionAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_session_t_int32_t(session));
+ int32_t idAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(id));
+ return statusTFromBinderStatus(
+ aps->registerEffect(descAidl, ioAidl, strategyAidl, sessionAidl, idAidl));
}
-status_t AudioSystem::unregisterEffect(int id)
-{
+status_t AudioSystem::unregisterEffect(int id) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->unregisterEffect(id);
+
+ int32_t idAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(id));
+ return statusTFromBinderStatus(
+ aps->unregisterEffect(idAidl));
}
-status_t AudioSystem::setEffectEnabled(int id, bool enabled)
-{
+status_t AudioSystem::setEffectEnabled(int id, bool enabled) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setEffectEnabled(id, enabled);
+
+ int32_t idAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(id));
+ return statusTFromBinderStatus(
+ aps->setEffectEnabled(idAidl, enabled));
}
-status_t AudioSystem::moveEffectsToIo(const std::vector<int>& ids, audio_io_handle_t io)
-{
+status_t AudioSystem::moveEffectsToIo(const std::vector<int>& ids, audio_io_handle_t io) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->moveEffectsToIo(ids, io);
+
+ std::vector<int32_t> idsAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<int32_t>>(ids, convertReinterpret<int32_t, int>));
+ int32_t ioAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(io));
+ return statusTFromBinderStatus(aps->moveEffectsToIo(idsAidl, ioAidl));
}
-status_t AudioSystem::isStreamActive(audio_stream_type_t stream, bool* state, uint32_t inPastMs)
-{
+status_t AudioSystem::isStreamActive(audio_stream_type_t stream, bool* state, uint32_t inPastMs) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
if (state == NULL) return BAD_VALUE;
- *state = aps->isStreamActive(stream, inPastMs);
- return NO_ERROR;
+
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t inPastMsAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(inPastMs));
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->isStreamActive(streamAidl, inPastMsAidl, state)));
+ return OK;
}
status_t AudioSystem::isStreamActiveRemotely(audio_stream_type_t stream, bool* state,
- uint32_t inPastMs)
-{
+ uint32_t inPastMs) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
if (state == NULL) return BAD_VALUE;
- *state = aps->isStreamActiveRemotely(stream, inPastMs);
- return NO_ERROR;
+
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t inPastMsAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(inPastMs));
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->isStreamActiveRemotely(streamAidl, inPastMsAidl, state)));
+ return OK;
}
-status_t AudioSystem::isSourceActive(audio_source_t stream, bool* state)
-{
+status_t AudioSystem::isSourceActive(audio_source_t stream, bool* state) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
if (state == NULL) return BAD_VALUE;
- *state = aps->isSourceActive(stream);
- return NO_ERROR;
+
+ media::AudioSourceType streamAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(stream));
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->isSourceActive(streamAidl, state)));
+ return OK;
}
-uint32_t AudioSystem::getPrimaryOutputSamplingRate()
-{
+uint32_t AudioSystem::getPrimaryOutputSamplingRate() {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return 0;
return af->getPrimaryOutputSamplingRate();
}
-size_t AudioSystem::getPrimaryOutputFrameCount()
-{
+size_t AudioSystem::getPrimaryOutputFrameCount() {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return 0;
return af->getPrimaryOutputFrameCount();
}
-status_t AudioSystem::setLowRamDevice(bool isLowRamDevice, int64_t totalMemory)
-{
+status_t AudioSystem::setLowRamDevice(bool isLowRamDevice, int64_t totalMemory) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setLowRamDevice(isLowRamDevice, totalMemory);
}
-void AudioSystem::clearAudioConfigCache()
-{
+void AudioSystem::clearAudioConfigCache() {
// called by restoreTrack_l(), which needs new IAudioFlinger and IAudioPolicyService instances
ALOGV("clearAudioConfigCache()");
{
@@ -1186,74 +1414,152 @@
status_t AudioSystem::setSupportedSystemUsages(const std::vector<audio_usage_t>& systemUsages) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == nullptr) return PERMISSION_DENIED;
- return aps->setSupportedSystemUsages(systemUsages);
+
+ std::vector<media::AudioUsage> systemUsagesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioUsage>>(systemUsages,
+ legacy2aidl_audio_usage_t_AudioUsage));
+ return statusTFromBinderStatus(aps->setSupportedSystemUsages(systemUsagesAidl));
}
-status_t AudioSystem::setAllowedCapturePolicy(uid_t uid, audio_flags_mask_t flags) {
+status_t AudioSystem::setAllowedCapturePolicy(uid_t uid, audio_flags_mask_t capturePolicy) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == nullptr) return PERMISSION_DENIED;
- return aps->setAllowedCapturePolicy(uid, flags);
+
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ int32_t capturePolicyAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_flags_mask_t_int32_t_mask(capturePolicy));
+ return statusTFromBinderStatus(aps->setAllowedCapturePolicy(uidAidl, capturePolicyAidl));
}
-audio_offload_mode_t AudioSystem::getOffloadSupport(const audio_offload_info_t& info)
-{
+audio_offload_mode_t AudioSystem::getOffloadSupport(const audio_offload_info_t& info) {
ALOGV("%s", __func__);
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return AUDIO_OFFLOAD_NOT_SUPPORTED;
- return aps->getOffloadSupport(info);
+
+ auto result = [&]() -> ConversionResult<audio_offload_mode_t> {
+ media::AudioOffloadInfo infoAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_offload_info_t_AudioOffloadInfo(info));
+ media::AudioOffloadMode retAidl;
+ RETURN_IF_ERROR(
+ statusTFromBinderStatus(aps->getOffloadSupport(infoAidl, &retAidl)));
+ return aidl2legacy_AudioOffloadMode_audio_offload_mode_t(retAidl);
+ }();
+
+ return result.value_or(static_cast<audio_offload_mode_t>(0));
}
status_t AudioSystem::listAudioPorts(audio_port_role_t role,
audio_port_type_t type,
- unsigned int *num_ports,
- struct audio_port_v7 *ports,
- unsigned int *generation)
-{
+ unsigned int* num_ports,
+ struct audio_port_v7* ports,
+ unsigned int* generation) {
+ if (num_ports == nullptr || (*num_ports != 0 && ports == nullptr) ||
+ generation == nullptr) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->listAudioPorts(role, type, num_ports, ports, generation);
+
+ media::AudioPortRole roleAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_role_t_AudioPortRole(role));
+ media::AudioPortType typeAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_type_t_AudioPortType(type));
+ media::Int numPortsAidl;
+ numPortsAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_ports));
+ std::vector<media::AudioPort> portsAidl;
+ int32_t generationAidl;
+
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->listAudioPorts(roleAidl, typeAidl, &numPortsAidl, &portsAidl, &generationAidl)));
+ *num_ports = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(numPortsAidl.value));
+ *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));
+ RETURN_STATUS_IF_ERROR(convertRange(portsAidl.begin(), portsAidl.end(), ports,
+ aidl2legacy_AudioPort_audio_port_v7));
+ return OK;
}
-status_t AudioSystem::getAudioPort(struct audio_port_v7 *port)
-{
+status_t AudioSystem::getAudioPort(struct audio_port_v7* port) {
+ if (port == nullptr) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getAudioPort(port);
+
+ media::AudioPort portAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_v7_AudioPort(*port));
+ RETURN_STATUS_IF_ERROR(
+ statusTFromBinderStatus(aps->getAudioPort(portAidl, &portAidl)));
+ *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(portAidl));
+ return OK;
}
-status_t AudioSystem::createAudioPatch(const struct audio_patch *patch,
- audio_patch_handle_t *handle)
-{
+status_t AudioSystem::createAudioPatch(const struct audio_patch* patch,
+ audio_patch_handle_t* handle) {
+ if (patch == nullptr || handle == nullptr) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->createAudioPatch(patch, handle);
+
+ media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_patch_AudioPatch(*patch));
+ int32_t handleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(*handle));
+ RETURN_STATUS_IF_ERROR(
+ statusTFromBinderStatus(aps->createAudioPatch(patchAidl, handleAidl, &handleAidl)));
+ *handle = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_patch_handle_t(handleAidl));
+ return OK;
}
-status_t AudioSystem::releaseAudioPatch(audio_patch_handle_t handle)
-{
+status_t AudioSystem::releaseAudioPatch(audio_patch_handle_t handle) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->releaseAudioPatch(handle);
+
+ int32_t handleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(handle));
+ return statusTFromBinderStatus(aps->releaseAudioPatch(handleAidl));
}
-status_t AudioSystem::listAudioPatches(unsigned int *num_patches,
- struct audio_patch *patches,
- unsigned int *generation)
-{
+status_t AudioSystem::listAudioPatches(unsigned int* num_patches,
+ struct audio_patch* patches,
+ unsigned int* generation) {
+ if (num_patches == nullptr || (*num_patches != 0 && patches == nullptr) ||
+ generation == nullptr) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->listAudioPatches(num_patches, patches, generation);
+
+
+ media::Int numPatchesAidl;
+ numPatchesAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_patches));
+ std::vector<media::AudioPatch> patchesAidl;
+ int32_t generationAidl;
+
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->listAudioPatches(&numPatchesAidl, &patchesAidl, &generationAidl)));
+ *num_patches = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(numPatchesAidl.value));
+ *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));
+ RETURN_STATUS_IF_ERROR(convertRange(patchesAidl.begin(), patchesAidl.end(), patches,
+ aidl2legacy_AudioPatch_audio_patch));
+ return OK;
}
-status_t AudioSystem::setAudioPortConfig(const struct audio_port_config *config)
-{
+status_t AudioSystem::setAudioPortConfig(const struct audio_port_config* config) {
+ if (config == nullptr) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setAudioPortConfig(config);
+
+ media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_config_AudioPortConfig(*config));
+ return statusTFromBinderStatus(aps->setAudioPortConfig(configAidl));
}
-status_t AudioSystem::addAudioPortCallback(const sp<AudioPortCallback>& callback)
-{
+status_t AudioSystem::addAudioPortCallback(const sp<AudioPortCallback>& callback) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
@@ -1269,8 +1575,7 @@
}
/*static*/
-status_t AudioSystem::removeAudioPortCallback(const sp<AudioPortCallback>& callback)
-{
+status_t AudioSystem::removeAudioPortCallback(const sp<AudioPortCallback>& callback) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
@@ -1285,8 +1590,7 @@
return (ret < 0) ? INVALID_OPERATION : NO_ERROR;
}
-status_t AudioSystem::addAudioVolumeGroupCallback(const sp<AudioVolumeGroupCallback>& callback)
-{
+status_t AudioSystem::addAudioVolumeGroupCallback(const sp<AudioVolumeGroupCallback>& callback) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
@@ -1301,8 +1605,7 @@
return (ret < 0) ? INVALID_OPERATION : NO_ERROR;
}
-status_t AudioSystem::removeAudioVolumeGroupCallback(const sp<AudioVolumeGroupCallback>& callback)
-{
+status_t AudioSystem::removeAudioVolumeGroupCallback(const sp<AudioVolumeGroupCallback>& callback) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
@@ -1319,8 +1622,7 @@
status_t AudioSystem::addAudioDeviceCallback(
const wp<AudioDeviceCallback>& callback, audio_io_handle_t audioIo,
- audio_port_handle_t portId)
-{
+ audio_port_handle_t portId) {
const sp<AudioFlingerClient> afc = getAudioFlingerClient();
if (afc == 0) {
return NO_INIT;
@@ -1337,8 +1639,7 @@
status_t AudioSystem::removeAudioDeviceCallback(
const wp<AudioDeviceCallback>& callback, audio_io_handle_t audioIo,
- audio_port_handle_t portId)
-{
+ audio_port_handle_t portId) {
const sp<AudioFlingerClient> afc = getAudioFlingerClient();
if (afc == 0) {
return NO_INIT;
@@ -1346,8 +1647,7 @@
return afc->removeAudioDeviceCallback(callback, audioIo, portId);
}
-audio_port_handle_t AudioSystem::getDeviceIdForIo(audio_io_handle_t audioIo)
-{
+audio_port_handle_t AudioSystem::getDeviceIdForIo(audio_io_handle_t audioIo) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
const sp<AudioIoDescriptor> desc = getIoDescriptor(audioIo);
@@ -1357,224 +1657,321 @@
return desc->getDeviceId();
}
-status_t AudioSystem::acquireSoundTriggerSession(audio_session_t *session,
- audio_io_handle_t *ioHandle,
- audio_devices_t *device)
-{
+status_t AudioSystem::acquireSoundTriggerSession(audio_session_t* session,
+ audio_io_handle_t* ioHandle,
+ audio_devices_t* device) {
+ if (session == nullptr || ioHandle == nullptr || device == nullptr) {
+ return BAD_VALUE;
+ }
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->acquireSoundTriggerSession(session, ioHandle, device);
+
+ media::SoundTriggerSession retAidl;
+ RETURN_STATUS_IF_ERROR(
+ statusTFromBinderStatus(aps->acquireSoundTriggerSession(&retAidl)));
+ *session = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_session_t(retAidl.session));
+ *ioHandle = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_io_handle_t(retAidl.ioHandle));
+ *device = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_devices_t(retAidl.device));
+ return OK;
}
-status_t AudioSystem::releaseSoundTriggerSession(audio_session_t session)
-{
+status_t AudioSystem::releaseSoundTriggerSession(audio_session_t session) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->releaseSoundTriggerSession(session);
+
+ int32_t sessionAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_session_t_int32_t(session));
+ return statusTFromBinderStatus(aps->releaseSoundTriggerSession(sessionAidl));
}
-audio_mode_t AudioSystem::getPhoneState()
-{
+audio_mode_t AudioSystem::getPhoneState() {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return AUDIO_MODE_INVALID;
- return aps->getPhoneState();
+
+ auto result = [&]() -> ConversionResult<audio_mode_t> {
+ media::AudioMode retAidl;
+ RETURN_IF_ERROR(statusTFromBinderStatus(aps->getPhoneState(&retAidl)));
+ return aidl2legacy_AudioMode_audio_mode_t(retAidl);
+ }();
+
+ return result.value_or(AUDIO_MODE_INVALID);
}
-status_t AudioSystem::registerPolicyMixes(const Vector<AudioMix>& mixes, bool registration)
-{
+status_t AudioSystem::registerPolicyMixes(const Vector<AudioMix>& mixes, bool registration) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->registerPolicyMixes(mixes, registration);
+
+ size_t mixesSize = std::min(mixes.size(), size_t{MAX_MIXES_PER_POLICY});
+ std::vector<media::AudioMix> mixesAidl;
+ RETURN_STATUS_IF_ERROR(
+ convertRange(mixes.begin(), mixes.begin() + mixesSize, std::back_inserter(mixesAidl),
+ legacy2aidl_AudioMix));
+ return statusTFromBinderStatus(aps->registerPolicyMixes(mixesAidl, registration));
}
-status_t AudioSystem::setUidDeviceAffinities(uid_t uid, const AudioDeviceTypeAddrVector& devices)
-{
+status_t AudioSystem::setUidDeviceAffinities(uid_t uid, const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setUidDeviceAffinities(uid, devices);
+
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(aps->setUidDeviceAffinities(uidAidl, devicesAidl));
}
status_t AudioSystem::removeUidDeviceAffinities(uid_t uid) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->removeUidDeviceAffinities(uid);
+
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ return statusTFromBinderStatus(aps->removeUidDeviceAffinities(uidAidl));
}
status_t AudioSystem::setUserIdDeviceAffinities(int userId,
- const AudioDeviceTypeAddrVector& devices)
-{
+ const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setUserIdDeviceAffinities(userId, devices);
+
+ int32_t userIdAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(userId));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(
+ aps->setUserIdDeviceAffinities(userIdAidl, devicesAidl));
}
-status_t AudioSystem::removeUserIdDeviceAffinities(int userId)
-{
+status_t AudioSystem::removeUserIdDeviceAffinities(int userId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->removeUserIdDeviceAffinities(userId);
+ int32_t userIdAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(userId));
+ return statusTFromBinderStatus(aps->removeUserIdDeviceAffinities(userIdAidl));
}
-status_t AudioSystem::startAudioSource(const struct audio_port_config *source,
- const audio_attributes_t *attributes,
- audio_port_handle_t *portId)
-{
+status_t AudioSystem::startAudioSource(const struct audio_port_config* source,
+ const audio_attributes_t* attributes,
+ audio_port_handle_t* portId) {
+ if (source == nullptr || attributes == nullptr || portId == nullptr) {
+ return BAD_VALUE;
+ }
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->startAudioSource(source, attributes, portId);
+
+ media::AudioPortConfig sourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_port_config_AudioPortConfig(*source));
+ media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));
+ int32_t portIdAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->startAudioSource(sourceAidl, attributesAidl, &portIdAidl)));
+ *portId = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_audio_port_handle_t(portIdAidl));
+ return OK;
}
-status_t AudioSystem::stopAudioSource(audio_port_handle_t portId)
-{
+status_t AudioSystem::stopAudioSource(audio_port_handle_t portId) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->stopAudioSource(portId);
+
+ int32_t portIdAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(portId));
+ return statusTFromBinderStatus(aps->stopAudioSource(portIdAidl));
}
-status_t AudioSystem::setMasterMono(bool mono)
-{
+status_t AudioSystem::setMasterMono(bool mono) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setMasterMono(mono);
+ return statusTFromBinderStatus(aps->setMasterMono(mono));
}
-status_t AudioSystem::getMasterMono(bool *mono)
-{
+status_t AudioSystem::getMasterMono(bool* mono) {
+ if (mono == nullptr) {
+ return BAD_VALUE;
+ }
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getMasterMono(mono);
+ return statusTFromBinderStatus(aps->getMasterMono(mono));
}
-status_t AudioSystem::setMasterBalance(float balance)
-{
+status_t AudioSystem::setMasterBalance(float balance) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->setMasterBalance(balance);
}
-status_t AudioSystem::getMasterBalance(float *balance)
-{
+status_t AudioSystem::getMasterBalance(float* balance) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->getMasterBalance(balance);
}
-float AudioSystem::getStreamVolumeDB(audio_stream_type_t stream, int index, audio_devices_t device)
-{
+float
+AudioSystem::getStreamVolumeDB(audio_stream_type_t stream, int index, audio_devices_t device) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return NAN;
- return aps->getStreamVolumeDB(stream, index, device);
+
+ auto result = [&]() -> ConversionResult<float> {
+ media::AudioStreamType streamAidl = VALUE_OR_RETURN(
+ legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
+ int32_t indexAidl = VALUE_OR_RETURN(convertIntegral<int32_t>(index));
+ int32_t deviceAidl = VALUE_OR_RETURN(legacy2aidl_audio_devices_t_int32_t(device));
+ float retAidl;
+ RETURN_IF_ERROR(statusTFromBinderStatus(
+ aps->getStreamVolumeDB(streamAidl, indexAidl, deviceAidl, &retAidl)));
+ return retAidl;
+ }();
+ return result.value_or(NAN);
}
-status_t AudioSystem::getMicrophones(std::vector<media::MicrophoneInfo> *microphones)
-{
+status_t AudioSystem::getMicrophones(std::vector<media::MicrophoneInfo>* microphones) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af == 0) return PERMISSION_DENIED;
return af->getMicrophones(microphones);
}
status_t AudioSystem::setAudioHalPids(const std::vector<pid_t>& pids) {
- const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
- if (af == nullptr) return PERMISSION_DENIED;
- return af->setAudioHalPids(pids);
+ const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
+ if (af == nullptr) return PERMISSION_DENIED;
+ return af->setAudioHalPids(pids);
}
-status_t AudioSystem::getSurroundFormats(unsigned int *numSurroundFormats,
- audio_format_t *surroundFormats,
- bool *surroundFormatsEnabled,
- bool reported)
-{
+status_t AudioSystem::getSurroundFormats(unsigned int* numSurroundFormats,
+ audio_format_t* surroundFormats,
+ bool* surroundFormatsEnabled,
+ bool reported) {
+ if (numSurroundFormats == nullptr || (*numSurroundFormats != 0 &&
+ (surroundFormats == nullptr ||
+ surroundFormatsEnabled == nullptr))) {
+ return BAD_VALUE;
+ }
+
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getSurroundFormats(
- numSurroundFormats, surroundFormats, surroundFormatsEnabled, reported);
+
+ media::Int numSurroundFormatsAidl;
+ numSurroundFormatsAidl.value =
+ VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*numSurroundFormats));
+ std::vector<media::audio::common::AudioFormat> surroundFormatsAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getSurroundFormats(reported, &numSurroundFormatsAidl, &surroundFormatsAidl,
+ surroundFormatsEnabled)));
+ *numSurroundFormats = VALUE_OR_RETURN_STATUS(
+ convertIntegral<unsigned int>(numSurroundFormatsAidl.value));
+ RETURN_STATUS_IF_ERROR(
+ convertRange(surroundFormatsAidl.begin(), surroundFormatsAidl.end(), surroundFormats,
+ aidl2legacy_AudioFormat_audio_format_t));
+ return OK;
}
-status_t AudioSystem::setSurroundFormatEnabled(audio_format_t audioFormat, bool enabled)
-{
+status_t AudioSystem::setSurroundFormatEnabled(audio_format_t audioFormat, bool enabled) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setSurroundFormatEnabled(audioFormat, enabled);
+
+ media::audio::common::AudioFormat audioFormatAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_format_t_AudioFormat(audioFormat));
+ return statusTFromBinderStatus(
+ aps->setSurroundFormatEnabled(audioFormatAidl, enabled));
}
-status_t AudioSystem::setAssistantUid(uid_t uid)
-{
- const sp <IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
+status_t AudioSystem::setAssistantUid(uid_t uid) {
+ const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setAssistantUid(uid);
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ return statusTFromBinderStatus(aps->setAssistantUid(uidAidl));
}
-status_t AudioSystem::setA11yServicesUids(const std::vector<uid_t>& uids)
-{
- const sp <IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
+status_t AudioSystem::setA11yServicesUids(const std::vector<uid_t>& uids) {
+ const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setA11yServicesUids(uids);
+ std::vector<int32_t> uidsAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<int32_t>>(uids, legacy2aidl_uid_t_int32_t));
+ return statusTFromBinderStatus(aps->setA11yServicesUids(uidsAidl));
}
-status_t AudioSystem::setCurrentImeUid(uid_t uid)
-{
- const sp <IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
+status_t AudioSystem::setCurrentImeUid(uid_t uid) {
+ const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setCurrentImeUid(uid);
+ int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
+ return statusTFromBinderStatus(aps->setCurrentImeUid(uidAidl));
}
-bool AudioSystem::isHapticPlaybackSupported()
-{
+bool AudioSystem::isHapticPlaybackSupported() {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return false;
- return aps->isHapticPlaybackSupported();
+
+ auto result = [&]() -> ConversionResult<bool> {
+ bool retVal;
+ RETURN_IF_ERROR(
+ statusTFromBinderStatus(aps->isHapticPlaybackSupported(&retVal)));
+ return retVal;
+ }();
+ return result.value_or(false);
}
status_t AudioSystem::getHwOffloadEncodingFormatsSupportedForA2DP(
- std::vector<audio_format_t> *formats) {
- const sp <IAudioPolicyService>
- & aps = AudioSystem::get_audio_policy_service();
+ std::vector<audio_format_t>* formats) {
+ if (formats == nullptr) {
+ return BAD_VALUE;
+ }
+
+ const sp<IAudioPolicyService>
+ & aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getHwOffloadEncodingFormatsSupportedForA2DP(formats);
+
+ std::vector<media::audio::common::AudioFormat> formatsAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getHwOffloadEncodingFormatsSupportedForA2DP(&formatsAidl)));
+ *formats = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<audio_format_t>>(formatsAidl,
+ aidl2legacy_AudioFormat_audio_format_t));
+ return OK;
}
-status_t AudioSystem::listAudioProductStrategies(AudioProductStrategyVector &strategies)
-{
+status_t AudioSystem::listAudioProductStrategies(AudioProductStrategyVector& strategies) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->listAudioProductStrategies(strategies);
+
+ std::vector<media::AudioProductStrategy> strategiesAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->listAudioProductStrategies(&strategiesAidl)));
+ strategies = VALUE_OR_RETURN_STATUS(
+ convertContainer<AudioProductStrategyVector>(strategiesAidl,
+ aidl2legacy_AudioProductStrategy));
+ return OK;
}
-audio_attributes_t AudioSystem::streamTypeToAttributes(audio_stream_type_t stream)
-{
+audio_attributes_t AudioSystem::streamTypeToAttributes(audio_stream_type_t stream) {
AudioProductStrategyVector strategies;
listAudioProductStrategies(strategies);
- for (const auto &strategy : strategies) {
+ for (const auto& strategy : strategies) {
auto attrVect = strategy.getAudioAttributes();
- auto iter = std::find_if(begin(attrVect), end(attrVect), [&stream](const auto &attributes) {
- return attributes.getStreamType() == stream; });
+ auto iter = std::find_if(begin(attrVect), end(attrVect), [&stream](const auto& attributes) {
+ return attributes.getStreamType() == stream;
+ });
if (iter != end(attrVect)) {
return iter->getAttributes();
}
}
- ALOGE("invalid stream type %s when converting to attributes", toString(stream).c_str());
+ ALOGE("invalid stream type %s when converting to attributes", toString(stream).c_str());
return AUDIO_ATTRIBUTES_INITIALIZER;
}
-audio_stream_type_t AudioSystem::attributesToStreamType(const audio_attributes_t &attr)
-{
+audio_stream_type_t AudioSystem::attributesToStreamType(const audio_attributes_t& attr) {
product_strategy_t psId;
status_t ret = AudioSystem::getProductStrategyFromAudioAttributes(AudioAttributes(attr), psId);
if (ret != NO_ERROR) {
- ALOGE("no strategy found for attributes %s", toString(attr).c_str());
+ ALOGE("no strategy found for attributes %s", toString(attr).c_str());
return AUDIO_STREAM_MUSIC;
}
AudioProductStrategyVector strategies;
listAudioProductStrategies(strategies);
- for (const auto &strategy : strategies) {
+ for (const auto& strategy : strategies) {
if (strategy.getId() == psId) {
auto attrVect = strategy.getAudioAttributes();
- auto iter = std::find_if(begin(attrVect), end(attrVect), [&attr](const auto &refAttr) {
- return AudioProductStrategy::attributesMatches(
- refAttr.getAttributes(), attr); });
+ auto iter = std::find_if(begin(attrVect), end(attrVect), [&attr](const auto& refAttr) {
+ return AudioProductStrategy::attributesMatches(
+ refAttr.getAttributes(), attr);
+ });
if (iter != end(attrVect)) {
return iter->getStreamType();
}
@@ -1585,131 +1982,201 @@
// virtual source is not expected to have an associated product strategy
break;
default:
- ALOGE("invalid attributes %s when converting to stream", toString(attr).c_str());
+ ALOGE("invalid attributes %s when converting to stream", toString(attr).c_str());
break;
}
return AUDIO_STREAM_MUSIC;
}
-status_t AudioSystem::getProductStrategyFromAudioAttributes(const AudioAttributes &aa,
- product_strategy_t &productStrategy)
-{
+status_t AudioSystem::getProductStrategyFromAudioAttributes(const AudioAttributes& aa,
+ product_strategy_t& productStrategy) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getProductStrategyFromAudioAttributes(aa,productStrategy);
+
+ media::AudioAttributesEx aaAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_AudioAttributes_AudioAttributesEx(aa));
+ int32_t productStrategyAidl;
+
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getProductStrategyFromAudioAttributes(aaAidl, &productStrategyAidl)));
+ productStrategy = VALUE_OR_RETURN_STATUS(
+ aidl2legacy_int32_t_product_strategy_t(productStrategyAidl));
+ return OK;
}
-status_t AudioSystem::listAudioVolumeGroups(AudioVolumeGroupVector &groups)
-{
+status_t AudioSystem::listAudioVolumeGroups(AudioVolumeGroupVector& groups) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->listAudioVolumeGroups(groups);
+
+ std::vector<media::AudioVolumeGroup> groupsAidl;
+ RETURN_STATUS_IF_ERROR(
+ statusTFromBinderStatus(aps->listAudioVolumeGroups(&groupsAidl)));
+ groups = VALUE_OR_RETURN_STATUS(
+ convertContainer<AudioVolumeGroupVector>(groupsAidl, aidl2legacy_AudioVolumeGroup));
+ return OK;
}
-status_t AudioSystem::getVolumeGroupFromAudioAttributes(const AudioAttributes &aa,
- volume_group_t &volumeGroup)
-{
+status_t AudioSystem::getVolumeGroupFromAudioAttributes(const AudioAttributes& aa,
+ volume_group_t& volumeGroup) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->getVolumeGroupFromAudioAttributes(aa, volumeGroup);
+
+ media::AudioAttributesEx aaAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_AudioAttributes_AudioAttributesEx(aa));
+ int32_t volumeGroupAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getVolumeGroupFromAudioAttributes(aaAidl, &volumeGroupAidl)));
+ volumeGroup = VALUE_OR_RETURN_STATUS(aidl2legacy_int32_t_volume_group_t(volumeGroupAidl));
+ return OK;
}
-status_t AudioSystem::setRttEnabled(bool enabled)
-{
+status_t AudioSystem::setRttEnabled(bool enabled) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return PERMISSION_DENIED;
- return aps->setRttEnabled(enabled);
+ return statusTFromBinderStatus(aps->setRttEnabled(enabled));
}
-bool AudioSystem::isCallScreenModeSupported()
-{
+bool AudioSystem::isCallScreenModeSupported() {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) return false;
- return aps->isCallScreenModeSupported();
+
+ auto result = [&]() -> ConversionResult<bool> {
+ bool retAidl;
+ RETURN_IF_ERROR(
+ statusTFromBinderStatus(aps->isCallScreenModeSupported(&retAidl)));
+ return retAidl;
+ }();
+ return result.value_or(false);
}
status_t AudioSystem::setDevicesRoleForStrategy(product_strategy_t strategy,
device_role_t role,
- const AudioDeviceTypeAddrVector &devices)
-{
+ const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->setDevicesRoleForStrategy(strategy, role, devices);
+
+ int32_t strategyAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_product_strategy_t_int32_t(strategy));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(
+ aps->setDevicesRoleForStrategy(strategyAidl, roleAidl, devicesAidl));
}
-status_t AudioSystem::removeDevicesRoleForStrategy(product_strategy_t strategy, device_role_t role)
-{
+status_t
+AudioSystem::removeDevicesRoleForStrategy(product_strategy_t strategy, device_role_t role) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->removeDevicesRoleForStrategy(strategy, role);
+ int32_t strategyAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_product_strategy_t_int32_t(strategy));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ return statusTFromBinderStatus(
+ aps->removeDevicesRoleForStrategy(strategyAidl, roleAidl));
}
status_t AudioSystem::getDevicesForRoleAndStrategy(product_strategy_t strategy,
device_role_t role,
- AudioDeviceTypeAddrVector &devices)
-{
+ AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->getDevicesForRoleAndStrategy(strategy, role, devices);
+ int32_t strategyAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_product_strategy_t_int32_t(strategy));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getDevicesForRoleAndStrategy(strategyAidl, roleAidl, &devicesAidl)));
+ devices = VALUE_OR_RETURN_STATUS(
+ convertContainer<AudioDeviceTypeAddrVector>(devicesAidl,
+ aidl2legacy_AudioDeviceTypeAddress));
+ return OK;
}
status_t AudioSystem::setDevicesRoleForCapturePreset(audio_source_t audioSource,
device_role_t role,
- const AudioDeviceTypeAddrVector &devices)
-{
+ const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->setDevicesRoleForCapturePreset(audioSource, role, devices);
+
+ media::AudioSourceType audioSourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(audioSource));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(
+ aps->setDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
status_t AudioSystem::addDevicesRoleForCapturePreset(audio_source_t audioSource,
device_role_t role,
- const AudioDeviceTypeAddrVector &devices)
-{
+ const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->addDevicesRoleForCapturePreset(audioSource, role, devices);
+ media::AudioSourceType audioSourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(audioSource));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(
+ aps->addDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
status_t AudioSystem::removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector& devices)
-{
+ audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->removeDevicesRoleForCapturePreset(audioSource, role, devices);
+ media::AudioSourceType audioSourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(audioSource));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
+ return statusTFromBinderStatus(
+ aps->removeDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
status_t AudioSystem::clearDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role)
-{
+ device_role_t role) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->clearDevicesRoleForCapturePreset(audioSource, role);
+ media::AudioSourceType audioSourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(audioSource));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ return statusTFromBinderStatus(
+ aps->clearDevicesRoleForCapturePreset(audioSourceAidl, roleAidl));
}
status_t AudioSystem::getDevicesForRoleAndCapturePreset(audio_source_t audioSource,
device_role_t role,
- AudioDeviceTypeAddrVector &devices)
-{
+ AudioDeviceTypeAddrVector& devices) {
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
if (aps == 0) {
return PERMISSION_DENIED;
}
- return aps->getDevicesForRoleAndCapturePreset(audioSource, role, devices);
+ media::AudioSourceType audioSourceAidl = VALUE_OR_RETURN_STATUS(
+ legacy2aidl_audio_source_t_AudioSourceType(audioSource));
+ media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
+ std::vector<media::AudioDevice> devicesAidl;
+ RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
+ aps->getDevicesForRoleAndCapturePreset(audioSourceAidl, roleAidl, &devicesAidl)));
+ devices = VALUE_OR_RETURN_STATUS(
+ convertContainer<AudioDeviceTypeAddrVector>(devicesAidl,
+ aidl2legacy_AudioDeviceTypeAddress));
+ return OK;
}
class CaptureStateListenerImpl : public media::BnCaptureStateListener,
@@ -1722,7 +2189,8 @@
void init() {
bool active;
- status_t status = mAps->registerSoundTriggerCaptureStateListener(this, &active);
+ status_t status = statusTFromBinderStatus(
+ mAps->registerSoundTriggerCaptureStateListener(this, &active));
if (status != NO_ERROR) {
mListener->onServiceDied();
return;
@@ -1750,7 +2218,7 @@
};
status_t AudioSystem::registerSoundTriggerCaptureStateListener(
- const sp<CaptureStateListener>& listener) {
+ const sp<CaptureStateListener>& listener) {
LOG_ALWAYS_FATAL_IF(listener == nullptr);
const sp<IAudioPolicyService>& aps =
@@ -1769,8 +2237,7 @@
// ---------------------------------------------------------------------------
int AudioSystem::AudioPolicyServiceClient::addAudioPortCallback(
- const sp<AudioPortCallback>& callback)
-{
+ const sp<AudioPortCallback>& callback) {
Mutex::Autolock _l(mLock);
for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {
if (mAudioPortCallbacks[i] == callback) {
@@ -1782,8 +2249,7 @@
}
int AudioSystem::AudioPolicyServiceClient::removeAudioPortCallback(
- const sp<AudioPortCallback>& callback)
-{
+ const sp<AudioPortCallback>& callback) {
Mutex::Autolock _l(mLock);
size_t i;
for (i = 0; i < mAudioPortCallbacks.size(); i++) {
@@ -1799,8 +2265,7 @@
}
-Status AudioSystem::AudioPolicyServiceClient::onAudioPortListUpdate()
-{
+Status AudioSystem::AudioPolicyServiceClient::onAudioPortListUpdate() {
Mutex::Autolock _l(mLock);
for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {
mAudioPortCallbacks[i]->onAudioPortListUpdate();
@@ -1808,8 +2273,7 @@
return Status::ok();
}
-Status AudioSystem::AudioPolicyServiceClient::onAudioPatchListUpdate()
-{
+Status AudioSystem::AudioPolicyServiceClient::onAudioPatchListUpdate() {
Mutex::Autolock _l(mLock);
for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {
mAudioPortCallbacks[i]->onAudioPatchListUpdate();
@@ -1819,8 +2283,7 @@
// ----------------------------------------------------------------------------
int AudioSystem::AudioPolicyServiceClient::addAudioVolumeGroupCallback(
- const sp<AudioVolumeGroupCallback>& callback)
-{
+ const sp<AudioVolumeGroupCallback>& callback) {
Mutex::Autolock _l(mLock);
for (size_t i = 0; i < mAudioVolumeGroupCallback.size(); i++) {
if (mAudioVolumeGroupCallback[i] == callback) {
@@ -1832,8 +2295,7 @@
}
int AudioSystem::AudioPolicyServiceClient::removeAudioVolumeGroupCallback(
- const sp<AudioVolumeGroupCallback>& callback)
-{
+ const sp<AudioVolumeGroupCallback>& callback) {
Mutex::Autolock _l(mLock);
size_t i;
for (i = 0; i < mAudioVolumeGroupCallback.size(); i++) {
@@ -1934,8 +2396,7 @@
return Status::ok();
}
-void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused)
-{
+void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused) {
{
Mutex::Autolock _l(mLock);
for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {