411aca7362
Pull in raspberry-vanilla's AOSP17 device tree changes for rpi5 while keeping all PawletOS customizations (A/B partition layout, sepolicy, zram, TWRP recovery scaffolding, ALSA HDMI pre-warm, product/overlay structure) intact on top. Upstream changes absorbed: - AOSP17 audio HAL refactor (StreamAlsa split into StreamAlsaBase/ StreamAlsaMonoPipe, Utils.cpp -> UtilsAlsa.cpp, new Bluetooth/stub helper classes, libeffects AIDL rebuild via *_ndk_shared defaults) - API level 36 -> 37, FCM matrix level 202504 -> 202604 - QuickSettings tile default split (SystemUIRpiOverlay, ported into pawlet_rpi_common where this overlay now lives) - vendor_tracing_descriptors added to enforce-product-packages-exist - misc AOSP17 logging header switch (android-base/logging.h -> Log.h) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
237 lines
9.9 KiB
C++
237 lines
9.9 KiB
C++
/*
|
|
* Copyright (C) 2026 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#define LOG_TAG "AHAL_StreamAlsaMonoPipe"
|
|
#include <Log.h>
|
|
|
|
#include <media/AidlConversionCppNdk.h>
|
|
|
|
#include "core-impl/StreamAlsaMonoPipe.h"
|
|
|
|
using aidl::android::hardware::audio::common::getChannelCount;
|
|
|
|
namespace aidl::android::hardware::audio::core {
|
|
|
|
StreamAlsaMonoPipe::StreamAlsaMonoPipe(StreamContext* context, const Metadata& metadata,
|
|
int readWriteRetries)
|
|
: StreamAlsaBase(context, metadata, readWriteRetries) {}
|
|
|
|
StreamAlsaMonoPipe::~StreamAlsaMonoPipe() {
|
|
cleanupWorker();
|
|
}
|
|
|
|
::android::NBAIO_Format StreamAlsaMonoPipe::getPipeFormat() const {
|
|
const audio_format_t audioFormat = VALUE_OR_FATAL(
|
|
aidl2legacy_AudioFormatDescription_audio_format_t(getContext().getFormat()));
|
|
const int channelCount = getChannelCount(getContext().getChannelLayout());
|
|
return ::android::Format_from_SR_C(getContext().getSampleRate(), channelCount, audioFormat);
|
|
}
|
|
|
|
::android::sp<::android::MonoPipe> StreamAlsaMonoPipe::makeSink(bool writeCanBlock) {
|
|
const ::android::NBAIO_Format format = getPipeFormat();
|
|
auto sink = ::android::sp<::android::MonoPipe>::make(mBufferSizeFrames, format, writeCanBlock);
|
|
const ::android::NBAIO_Format offers[1] = {format};
|
|
size_t numCounterOffers = 0;
|
|
ssize_t index = sink->negotiate(offers, 1, nullptr, numCounterOffers);
|
|
LOG_IF(FATAL, index != 0) << __func__ << ": Negotiation for the sink failed, index = " << index;
|
|
return sink;
|
|
}
|
|
|
|
::android::sp<::android::MonoPipeReader> StreamAlsaMonoPipe::makeSource(::android::MonoPipe* pipe) {
|
|
const ::android::NBAIO_Format format = getPipeFormat();
|
|
const ::android::NBAIO_Format offers[1] = {format};
|
|
auto source = ::android::sp<::android::MonoPipeReader>::make(pipe);
|
|
size_t numCounterOffers = 0;
|
|
ssize_t index = source->negotiate(offers, 1, nullptr, numCounterOffers);
|
|
LOG_IF(FATAL, index != 0) << __func__
|
|
<< ": Negotiation for the source failed, index = " << index;
|
|
return source;
|
|
}
|
|
|
|
::android::status_t StreamAlsaMonoPipe::standby() {
|
|
teardownIo();
|
|
return ::android::OK;
|
|
}
|
|
|
|
::android::status_t StreamAlsaMonoPipe::start() {
|
|
if (!mAlsaDeviceProxies.empty()) {
|
|
// This is a resume after a pause.
|
|
return ::android::OK;
|
|
}
|
|
decltype(mAlsaDeviceProxies) alsaDeviceProxies;
|
|
decltype(mSources) sources;
|
|
decltype(mSinks) sinks;
|
|
if (::android::status_t status = openDeviceProxies(&alsaDeviceProxies);
|
|
status != ::android::OK) {
|
|
return status;
|
|
}
|
|
for (size_t i = 0; i < alsaDeviceProxies.size(); ++i) {
|
|
auto sink = makeSink(mIsInput); // Do not block the writer when it is on our thread.
|
|
if (sink != nullptr) {
|
|
sinks.push_back(sink);
|
|
} else {
|
|
return ::android::NO_INIT;
|
|
}
|
|
if (auto source = makeSource(sink.get()); source != nullptr) {
|
|
sources.push_back(source);
|
|
} else {
|
|
return ::android::NO_INIT;
|
|
}
|
|
}
|
|
mAlsaDeviceProxies = std::move(alsaDeviceProxies);
|
|
mSources = std::move(sources);
|
|
mSinks = std::move(sinks);
|
|
mIoThreadIsRunning = true;
|
|
for (size_t i = 0; i < mAlsaDeviceProxies.size(); ++i) {
|
|
mIoThreads.emplace_back(
|
|
mIsInput ? &StreamAlsaMonoPipe::inputIoThread : &StreamAlsaMonoPipe::outputIoThread,
|
|
this, i);
|
|
}
|
|
return ::android::OK;
|
|
}
|
|
|
|
::android::status_t StreamAlsaMonoPipe::transfer(void* buffer, size_t frameCount,
|
|
size_t* actualFrameCount, int32_t* latencyMs) {
|
|
if (mAlsaDeviceProxies.empty()) {
|
|
LOG(FATAL) << __func__ << ": no opened devices";
|
|
return ::android::NO_INIT;
|
|
}
|
|
const size_t bytesToTransfer = frameCount * mFrameSizeBytes;
|
|
unsigned maxLatency = 0;
|
|
if (mIsInput) {
|
|
const size_t i = 0; // For the input case, only support a single device.
|
|
LOG(VERBOSE) << __func__ << ": reading from sink " << i;
|
|
ssize_t framesRead = mSources[i]->read(buffer, frameCount);
|
|
LOG_IF(FATAL, framesRead < 0) << "Error reading from the pipe: " << framesRead;
|
|
if (ssize_t framesMissing = static_cast<ssize_t>(frameCount) - framesRead;
|
|
framesMissing > 0) {
|
|
LOG(WARNING) << __func__ << ": incomplete data received, inserting " << framesMissing
|
|
<< " frames of silence";
|
|
memset(static_cast<char*>(buffer) + framesRead * mFrameSizeBytes, 0,
|
|
framesMissing * mFrameSizeBytes);
|
|
}
|
|
maxLatency = proxy_get_latency(mAlsaDeviceProxies[i].get());
|
|
} else {
|
|
alsa::applyGain(buffer, mGain, bytesToTransfer, mConfig.value().format, mConfig->channels);
|
|
for (size_t i = 0; i < mAlsaDeviceProxies.size(); ++i) {
|
|
LOG(VERBOSE) << __func__ << ": writing into sink " << i;
|
|
ssize_t framesWritten = mSinks[i]->write(buffer, frameCount);
|
|
LOG_IF(FATAL, framesWritten < 0) << "Error writing into the pipe: " << framesWritten;
|
|
if (ssize_t framesLost = static_cast<ssize_t>(frameCount) - framesWritten;
|
|
framesLost > 0) {
|
|
LOG(WARNING) << __func__ << ": sink " << i << " incomplete data sent, dropping "
|
|
<< framesLost << " frames";
|
|
}
|
|
maxLatency = std::max(maxLatency, proxy_get_latency(mAlsaDeviceProxies[i].get()));
|
|
}
|
|
}
|
|
*actualFrameCount = frameCount;
|
|
maxLatency = std::min(maxLatency, static_cast<unsigned>(std::numeric_limits<int32_t>::max()));
|
|
*latencyMs = maxLatency;
|
|
return ::android::OK;
|
|
}
|
|
|
|
void StreamAlsaMonoPipe::shutdown() {
|
|
teardownIo();
|
|
}
|
|
|
|
void StreamAlsaMonoPipe::inputIoThread(size_t idx) {
|
|
#if defined(__ANDROID__)
|
|
setWorkerThreadPriority(pthread_gettid_np(pthread_self()));
|
|
const std::string threadName = (std::string("in_") + std::to_string(idx)).substr(0, 15);
|
|
pthread_setname_np(pthread_self(), threadName.c_str());
|
|
#endif
|
|
const size_t bufferSize = mBufferSizeFrames * mFrameSizeBytes;
|
|
std::vector<char> buffer(bufferSize);
|
|
while (mIoThreadIsRunning) {
|
|
if (int ret = proxy_read_with_retries(mAlsaDeviceProxies[idx].get(), &buffer[0], bufferSize,
|
|
mReadWriteRetries);
|
|
ret == 0) {
|
|
size_t bufferFramesWritten = 0;
|
|
while (bufferFramesWritten < mBufferSizeFrames) {
|
|
if (!mIoThreadIsRunning) return;
|
|
ssize_t framesWrittenOrError =
|
|
mSinks[idx]->write(&buffer[0], mBufferSizeFrames - bufferFramesWritten);
|
|
if (framesWrittenOrError >= 0) {
|
|
bufferFramesWritten += framesWrittenOrError;
|
|
} else {
|
|
LOG(WARNING) << __func__ << "[" << idx
|
|
<< "]: Error while writing into the pipe: "
|
|
<< framesWrittenOrError;
|
|
}
|
|
}
|
|
} else {
|
|
// Errors when the stream is being stopped are expected.
|
|
LOG_IF(WARNING, mIoThreadIsRunning)
|
|
<< __func__ << "[" << idx << "]: Error reading from ALSA: " << ret;
|
|
}
|
|
}
|
|
}
|
|
|
|
void StreamAlsaMonoPipe::outputIoThread(size_t idx) {
|
|
#if defined(__ANDROID__)
|
|
setWorkerThreadPriority(pthread_gettid_np(pthread_self()));
|
|
const std::string threadName = (std::string("out_") + std::to_string(idx)).substr(0, 15);
|
|
pthread_setname_np(pthread_self(), threadName.c_str());
|
|
#endif
|
|
const size_t bufferSize = mBufferSizeFrames * mFrameSizeBytes;
|
|
std::vector<char> buffer(bufferSize);
|
|
while (mIoThreadIsRunning) {
|
|
ssize_t framesReadOrError = mSources[idx]->read(&buffer[0], mBufferSizeFrames);
|
|
if (framesReadOrError > 0) {
|
|
int ret = proxy_write_with_retries(mAlsaDeviceProxies[idx].get(), &buffer[0],
|
|
framesReadOrError * mFrameSizeBytes,
|
|
mReadWriteRetries);
|
|
// Errors when the stream is being stopped are expected.
|
|
LOG_IF(WARNING, ret != 0 && mIoThreadIsRunning)
|
|
<< __func__ << "[" << idx << "]: Error writing into ALSA: " << ret;
|
|
} else if (framesReadOrError == 0) {
|
|
// MonoPipeReader does not have a blocking read, while use of std::condition_variable
|
|
// requires use of a mutex. For now, just do a 1ms sleep. Consider using a different
|
|
// pipe / ring buffer mechanism.
|
|
if (mIoThreadIsRunning) usleep(1000);
|
|
} else {
|
|
LOG(WARNING) << __func__ << "[" << idx
|
|
<< "]: Error while reading from the pipe: " << framesReadOrError;
|
|
}
|
|
}
|
|
}
|
|
|
|
void StreamAlsaMonoPipe::teardownIo() {
|
|
mIoThreadIsRunning = false;
|
|
if (mIsInput) {
|
|
LOG(DEBUG) << __func__ << ": shutting down pipes";
|
|
for (auto& sink : mSinks) {
|
|
sink->shutdown(true);
|
|
}
|
|
}
|
|
LOG(DEBUG) << __func__ << ": stopping PCM streams";
|
|
for (const auto& proxy : mAlsaDeviceProxies) {
|
|
proxy_stop(proxy.get());
|
|
}
|
|
LOG(DEBUG) << __func__ << ": joining threads";
|
|
for (auto& thread : mIoThreads) {
|
|
if (thread.joinable()) thread.join();
|
|
}
|
|
mIoThreads.clear();
|
|
LOG(DEBUG) << __func__ << ": closing PCM devices";
|
|
mAlsaDeviceProxies.clear();
|
|
mSources.clear();
|
|
mSinks.clear();
|
|
}
|
|
|
|
} // namespace aidl::android::hardware::audio::core
|