audioflinger: define MMAP HAL Stream control interface
Added definition of MmapStreamInterface used by Oboe service
to open, configure and control MMAP streams at the audio HAl.
This interface is implemented by audioflinger and abstracts the details
of interacting with audio policy manager and audio HAL from Oboe service.
A callback interface MmapStreamCallback is also defiend to communicate
volume and routing changes back to Oboe service.
Bug: 33398120
Test: build
Change-Id: If953d44903aaa4eb17ff16f1922ca16e5e0e0a87
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index d08309b..298d455 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -98,6 +98,7 @@
uint32_t AudioFlinger::mScreenState;
+
#ifdef TEE_SINK
bool AudioFlinger::mTeeSinkInputEnabled = false;
bool AudioFlinger::mTeeSinkOutputEnabled = false;
@@ -112,6 +113,9 @@
// we define a minimum time during which a global effect is considered enabled.
static const nsecs_t kMinGlobalEffectEnabletimeNs = seconds(7200);
+Mutex gLock;
+wp<AudioFlinger> gAudioFlinger;
+
// ----------------------------------------------------------------------------
std::string formatToString(audio_format_t format) {
@@ -201,6 +205,8 @@
mPatchPanel = new PatchPanel(this);
mMode = AUDIO_MODE_NORMAL;
+
+ gAudioFlinger = this;
}
AudioFlinger::~AudioFlinger()
@@ -233,6 +239,44 @@
}
}
+//static
+status_t MmapStreamInterface::openMmapStream(MmapStreamInterface::stream_direction_t direction,
+ const audio_attributes_t *attr,
+ audio_config_base_t *config,
+ const MmapStreamInterface::Client& client,
+ audio_port_handle_t *deviceId,
+ const sp<MmapStreamCallback>& callback,
+ sp<MmapStreamInterface>& interface)
+{
+ sp<AudioFlinger> af;
+ {
+ Mutex::Autolock _l(gLock);
+ af = gAudioFlinger.promote();
+ }
+ status_t ret = NO_INIT;
+ if (af != 0) {
+ ret = af->openMmapStream(
+ direction, attr, config, client, deviceId, callback, interface);
+ }
+ return ret;
+}
+
+status_t AudioFlinger::openMmapStream(MmapStreamInterface::stream_direction_t direction __unused,
+ const audio_attributes_t *attr __unused,
+ audio_config_base_t *config __unused,
+ const MmapStreamInterface::Client& client __unused,
+ audio_port_handle_t *deviceId __unused,
+ const sp<MmapStreamCallback>& callback __unused,
+ sp<MmapStreamInterface>& interface __unused)
+{
+ status_t ret = initCheck();
+ if (ret != NO_ERROR) {
+ return ret;
+ }
+
+ return ret;
+}
+
static const char * const audio_interfaces[] = {
AUDIO_HARDWARE_MODULE_ID_PRIMARY,
AUDIO_HARDWARE_MODULE_ID_A2DP,
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index d18ca47..3d6571e 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -34,6 +34,8 @@
#include <media/IAudioRecord.h>
#include <media/AudioSystem.h>
#include <media/AudioTrack.h>
+#include <media/MmapStreamInterface.h>
+#include <media/MmapStreamCallback.h>
#include <utils/Atomic.h>
#include <utils/Errors.h>
@@ -98,6 +100,7 @@
public BnAudioFlinger
{
friend class BinderService<AudioFlinger>; // for AudioFlinger()
+
public:
static const char* getServiceName() ANDROID_API { return "media.audio_flinger"; }
@@ -281,6 +284,14 @@
sp<NBLog::Writer> newWriter_l(size_t size, const char *name);
void unregisterWriter(const sp<NBLog::Writer>& writer);
sp<EffectsFactoryHalInterface> getEffectsFactory();
+
+ status_t openMmapStream(MmapStreamInterface::stream_direction_t direction,
+ const audio_attributes_t *attr,
+ audio_config_base_t *config,
+ const MmapStreamInterface::Client& client,
+ audio_port_handle_t *deviceId,
+ const sp<MmapStreamCallback>& callback,
+ sp<MmapStreamInterface>& interface);
private:
static const size_t kLogMemorySize = 40 * 1024;
sp<MemoryDealer> mLogMemoryDealer; // == 0 when NBLog is disabled
@@ -288,6 +299,7 @@
// for as long as possible. The memory is only freed when it is needed for another log writer.
Vector< sp<NBLog::Writer> > mUnregisteredWriters;
Mutex mUnregisteredWritersLock;
+
public:
class SyncEvent;