gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add audio attributes info when starting aaudio tracks on MMAP mix." into rvc-dev

Browse Source
gugelfrei
TreeHugger Robot 4 years ago committed by Android (Google) Code Review
parent e2074d7b4f d1f1cb68f5
commit 1cfbd0a8a1
18 changed files with 91 additions and 52 deletions
Show Stats Download Patch File Download Diff File

5
include/media/MmapStreamInterface.h
Unescape View File

@ -107,12 +107,15 @@ class MmapStreamInterface : public virtual RefBase
* createMmapBuffer() must be called before calling start()
*
* \param[in] client a AudioClient struct describing the client starting on this stream.
* \param[in] attr audio attributes provided by the client.
* \param[out] handle unique handle for this instance. Used with stop().
* \return OK in case of success.
* NO_INIT in case of initialization error
* INVALID_OPERATION if called out of sequence
*/
virtual status_t start(const AudioClient& client, audio_port_handle_t *handle) = 0;
virtual status_t start(const AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *handle) = 0;
/**
* Stop a stream operating in mmap mode.

5
media/libaaudio/src/binding/AAudioBinderClient.h
Unescape View File

@ -98,8 +98,9 @@ public:
pid_t clientThreadId) override;
aaudio_result_t startClient(aaudio_handle_t streamHandle __unused,
const android::AudioClient& client __unused,
audio_port_handle_t *clientHandle) override {
const android::AudioClient& client __unused,
const audio_attributes_t *attr __unused,
audio_port_handle_t *clientHandle __unused) override {
return AAUDIO_ERROR_UNAVAILABLE;
}

5
media/libaaudio/src/binding/AAudioServiceInterface.h
Unescape View File

@ -89,8 +89,9 @@ public:
pid_t clientThreadId) = 0;
virtual aaudio_result_t startClient(aaudio_handle_t streamHandle,
const android::AudioClient& client,
audio_port_handle_t *clientHandle) = 0;
const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) = 0;
virtual aaudio_result_t stopClient(aaudio_handle_t streamHandle,
audio_port_handle_t clientHandle) = 0;

3
media/libaaudio/src/client/AudioStreamInternal.cpp
Unescape View File

@ -429,13 +429,14 @@ aaudio_result_t AudioStreamInternal::unregisterThread() {
}
aaudio_result_t AudioStreamInternal::startClient(const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *portHandle) {
ALOGV("%s() called", __func__);
if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {
return AAUDIO_ERROR_INVALID_STATE;
}
aaudio_result_t result = mServiceInterface.startClient(mServiceStreamHandle,
client, portHandle);
client, attr, portHandle);
ALOGV("%s(%d) returning %d", __func__, *portHandle, result);
return result;
}

1
media/libaaudio/src/client/AudioStreamInternal.h
Unescape View File

@ -90,6 +90,7 @@ public:
int64_t calculateReasonableTimeout();
aaudio_result_t startClient(const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle);
aaudio_result_t stopClient(audio_port_handle_t clientHandle);

3
services/audioflinger/AudioFlinger.h
Unescape View File

@ -681,7 +681,8 @@ using effect_buffer_t = int16_t;
struct audio_mmap_buffer_info *info);
virtual status_t getMmapPosition(struct audio_mmap_position *position);
virtual status_t start(const AudioClient& client,
audio_port_handle_t *handle);
const audio_attributes_t *attr,
audio_port_handle_t *handle);
virtual status_t stop(audio_port_handle_t handle);
virtual status_t standby();

12
services/audioflinger/Threads.cpp
Unescape View File

@ -8633,10 +8633,10 @@ status_t AudioFlinger::MmapThreadHandle::getMmapPosition(struct audio_mmap_posit
}
status_t AudioFlinger::MmapThreadHandle::start(const AudioClient& client,
audio_port_handle_t *handle)
const audio_attributes_t *attr, audio_port_handle_t *handle)
{
return mThread->start(client, handle);
return mThread->start(client, attr, handle);
}
status_t AudioFlinger::MmapThreadHandle::stop(audio_port_handle_t handle)
@ -8741,6 +8741,7 @@ status_t AudioFlinger::MmapThread::exitStandby()
}
status_t AudioFlinger::MmapThread::start(const AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *handle)
{
ALOGV("%s clientUid %d mStandby %d mPortId %d *handle %d", __FUNCTION__,
@ -8831,9 +8832,10 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client,
}
// Given that MmapThread::mAttr is mutable, should a MmapTrack have attributes ?
sp<MmapTrack> track = new MmapTrack(this, mAttr, mSampleRate, mFormat, mChannelMask, mSessionId,
isOutput(), client.clientUid, client.clientPid,
IPCThreadState::self()->getCallingPid(), portId);
sp<MmapTrack> track = new MmapTrack(this, attr == nullptr ? mAttr : *attr, mSampleRate, mFormat,
mChannelMask, mSessionId, isOutput(), client.clientUid,
client.clientPid, IPCThreadState::self()->getCallingPid(),
portId);
if (isOutput()) {
// force volume update when a new track is added

4
services/audioflinger/Threads.h
Unescape View File

@ -1776,7 +1776,9 @@ class MmapThread : public ThreadBase
status_t createMmapBuffer(int32_t minSizeFrames,
struct audio_mmap_buffer_info *info);
status_t getMmapPosition(struct audio_mmap_position *position);
status_t start(const AudioClient& client, audio_port_handle_t *handle);
status_t start(const AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *handle);
status_t stop(audio_port_handle_t handle);
status_t standby();

7
services/oboeservice/AAudioService.cpp
Unescape View File

@ -310,14 +310,15 @@ aaudio_result_t AAudioService::unregisterAudioThread(aaudio_handle_t streamHandl
}
aaudio_result_t AAudioService::startClient(aaudio_handle_t streamHandle,
const android::AudioClient& client,
audio_port_handle_t *clientHandle) {
const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) {
sp<AAudioServiceStreamBase> serviceStream = convertHandleToServiceStream(streamHandle);
if (serviceStream.get() == nullptr) {
ALOGE("%s(), illegal stream handle = 0x%0x", __func__, streamHandle);
return AAUDIO_ERROR_INVALID_HANDLE;
}
aaudio_result_t result = serviceStream->startClient(client, clientHandle);
aaudio_result_t result = serviceStream->startClient(client, attr, clientHandle);
return checkForPendingClose(serviceStream, result);
}

5
services/oboeservice/AAudioService.h
Unescape View File

@ -77,8 +77,9 @@ public:
pid_t tid) override;
aaudio_result_t startClient(aaudio::aaudio_handle_t streamHandle,
const android::AudioClient& client,
audio_port_handle_t *clientHandle) override;
const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) override;
aaudio_result_t stopClient(aaudio::aaudio_handle_t streamHandle,
audio_port_handle_t clientHandle) override;

33
services/oboeservice/AAudioServiceEndpoint.cpp
Unescape View File

@ -138,3 +138,36 @@ bool AAudioServiceEndpoint::matches(const AAudioStreamConfiguration& configurati
}
return true;
}
// static
audio_attributes_t AAudioServiceEndpoint::getAudioAttributesFrom(
const AAudioStreamParameters *params) {
if (params == nullptr) {
return {};
}
const aaudio_direction_t direction = params->getDirection();
const audio_content_type_t contentType =
AAudioConvert_contentTypeToInternal(params->getContentType());
// Usage only used for OUTPUT
const audio_usage_t usage = (direction == AAUDIO_DIRECTION_OUTPUT)
? AAudioConvert_usageToInternal(params->getUsage())
: AUDIO_USAGE_UNKNOWN;
const audio_source_t source = (direction == AAUDIO_DIRECTION_INPUT)
? AAudioConvert_inputPresetToAudioSource(params->getInputPreset())
: AUDIO_SOURCE_DEFAULT;
audio_flags_mask_t flags;
if (direction == AAUDIO_DIRECTION_OUTPUT) {
flags = AUDIO_FLAG_LOW_LATENCY
| AAudioConvert_allowCapturePolicyToAudioFlagsMask(params->getAllowedCapturePolicy());
} else {
flags = AUDIO_FLAG_LOW_LATENCY
| AAudioConvert_privacySensitiveToAudioFlagsMask(params->isPrivacySensitive());
}
return {
.content_type = contentType,
.usage = usage,
.source = source,
.flags = flags,
.tags = "" };
}

3
services/oboeservice/AAudioServiceEndpoint.h
Unescape View File

@ -60,6 +60,7 @@ public:
audio_port_handle_t clientHandle) = 0;
virtual aaudio_result_t startClient(const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) {
ALOGD("AAudioServiceEndpoint::startClient(...) AAUDIO_ERROR_UNAVAILABLE");
return AAUDIO_ERROR_UNAVAILABLE;
@ -118,6 +119,8 @@ protected:
void disconnectRegisteredStreams();
static audio_attributes_t getAudioAttributesFrom(const AAudioStreamParameters *params);
mutable std::mutex mLockStreams;
std::vector<android::sp<AAudioServiceStreamBase>> mRegisteredStreams;

39
services/oboeservice/AAudioServiceEndpointMMAP.cpp
Unescape View File

@ -79,32 +79,7 @@ aaudio_result_t AAudioServiceEndpointMMAP::open(const aaudio::AAudioStreamReques
copyFrom(request.getConstantConfiguration());
aaudio_direction_t direction = getDirection();
const audio_content_type_t contentType =
AAudioConvert_contentTypeToInternal(getContentType());
// Usage only used for OUTPUT
const audio_usage_t usage = (direction == AAUDIO_DIRECTION_OUTPUT)
? AAudioConvert_usageToInternal(getUsage())
: AUDIO_USAGE_UNKNOWN;
const audio_source_t source = (direction == AAUDIO_DIRECTION_INPUT)
? AAudioConvert_inputPresetToAudioSource(getInputPreset())
: AUDIO_SOURCE_DEFAULT;
audio_flags_mask_t flags;
if (direction == AAUDIO_DIRECTION_OUTPUT) {
flags = AUDIO_FLAG_LOW_LATENCY
| AAudioConvert_allowCapturePolicyToAudioFlagsMask(getAllowedCapturePolicy());
} else {
flags = AUDIO_FLAG_LOW_LATENCY
| AAudioConvert_privacySensitiveToAudioFlagsMask(isPrivacySensitive());
}
const audio_attributes_t attributes = {
.content_type = contentType,
.usage = usage,
.source = source,
.flags = flags,
.tags = ""
};
const audio_attributes_t attributes = getAudioAttributesFrom(this);
mMmapClient.clientUid = request.getUserId();
mMmapClient.clientPid = request.getProcessId();
@ -127,6 +102,8 @@ aaudio_result_t AAudioServiceEndpointMMAP::open(const aaudio::AAudioStreamReques
int32_t aaudioSamplesPerFrame = getSamplesPerFrame();
const aaudio_direction_t direction = getDirection();
if (direction == AAUDIO_DIRECTION_OUTPUT) {
config.channel_mask = (aaudioSamplesPerFrame == AAUDIO_UNSPECIFIED)
? AUDIO_CHANNEL_OUT_STEREO
@ -269,7 +246,12 @@ aaudio_result_t AAudioServiceEndpointMMAP::startStream(sp<AAudioServiceStreamBas
// Start the client on behalf of the AAudio service.
// Use the port handle that was provided by openMmapStream().
audio_port_handle_t tempHandle = mPortHandle;
aaudio_result_t result = startClient(mMmapClient, &tempHandle);
audio_attributes_t attr = {};
if (stream != nullptr) {
attr = getAudioAttributesFrom(stream.get());
}
aaudio_result_t result = startClient(
mMmapClient, stream == nullptr ? nullptr : &attr, &tempHandle);
// When AudioFlinger is passed a valid port handle then it should not change it.
LOG_ALWAYS_FATAL_IF(tempHandle != mPortHandle,
"%s() port handle not expected to change from %d to %d",
@ -294,9 +276,10 @@ aaudio_result_t AAudioServiceEndpointMMAP::stopStream(sp<AAudioServiceStreamBase
}
aaudio_result_t AAudioServiceEndpointMMAP::startClient(const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) {
if (mMmapStream == nullptr) return AAUDIO_ERROR_NULL;
status_t status = mMmapStream->start(client, clientHandle);
status_t status = mMmapStream->start(client, attr, clientHandle);
return AAudioConvert_androidToAAudioResult(status);
}

3
services/oboeservice/AAudioServiceEndpointMMAP.h
Unescape View File

@ -59,7 +59,8 @@ public:
audio_port_handle_t clientHandle) override;
aaudio_result_t startClient(const android::AudioClient& client,
audio_port_handle_t *clientHandle) override;
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) override;
aaudio_result_t stopClient(audio_port_handle_t clientHandle) override;

4
services/oboeservice/AAudioServiceEndpointShared.cpp
Unescape View File

@ -152,7 +152,9 @@ aaudio_result_t AAudioServiceEndpointShared::startStream(sp<AAudioServiceStreamB
}
if (result == AAUDIO_OK) {
result = getStreamInternal()->startClient(sharedStream->getAudioClient(), clientHandle);
const audio_attributes_t attr = getAudioAttributesFrom(sharedStream.get());
result = getStreamInternal()->startClient(
sharedStream->getAudioClient(), &attr, clientHandle);
if (result != AAUDIO_OK) {
if (--mRunningStreamCount == 0) { // atomic
stopSharingThread();

3
services/oboeservice/AAudioServiceStreamBase.h
Unescape View File

@ -111,7 +111,8 @@ public:
virtual aaudio_result_t flush();
virtual aaudio_result_t startClient(const android::AudioClient& client __unused,
virtual aaudio_result_t startClient(const android::AudioClient& client,
const audio_attributes_t *attr __unused,
audio_port_handle_t *clientHandle __unused) {
ALOGD("AAudioServiceStreamBase::startClient(%p, ...) AAUDIO_ERROR_UNAVAILABLE", &client);
return AAUDIO_ERROR_UNAVAILABLE;

7
services/oboeservice/AAudioServiceStreamMMAP.cpp
Unescape View File

@ -86,7 +86,7 @@ aaudio_result_t AAudioServiceStreamMMAP::startDevice() {
aaudio_result_t result = AAudioServiceStreamBase::startDevice();
if (!mInService && result == AAUDIO_OK) {
// Note that this can sometimes take 200 to 300 msec for a cold start!
result = startClient(mMmapClient, &mClientHandle);
result = startClient(mMmapClient, nullptr /*const audio_attributes_t* */, &mClientHandle);
}
return result;
}
@ -117,14 +117,15 @@ aaudio_result_t AAudioServiceStreamMMAP::stop() {
}
aaudio_result_t AAudioServiceStreamMMAP::startClient(const android::AudioClient& client,
audio_port_handle_t *clientHandle) {
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) {
sp<AAudioServiceEndpoint> endpoint = mServiceEndpointWeak.promote();
if (endpoint == nullptr) {
ALOGE("%s() has no endpoint", __func__);
return AAUDIO_ERROR_INVALID_STATE;
}
// Start the client on behalf of the application. Generate a new porthandle.
aaudio_result_t result = endpoint->startClient(client, clientHandle);
aaudio_result_t result = endpoint->startClient(client, attr, clientHandle);
return result;
}

1
services/oboeservice/AAudioServiceStreamMMAP.h
Unescape View File

@ -63,6 +63,7 @@ public:
aaudio_result_t stop() override;
aaudio_result_t startClient(const android::AudioClient& client,
const audio_attributes_t *attr,
audio_port_handle_t *clientHandle) override;
aaudio_result_t stopClient(audio_port_handle_t clientHandle) override;

Write Preview
Loading…
Cancel
Save