Add support for mmap stream
Add support for MMAP streams created by Oboe service.
- A new audio thread class MmapThread deriving from ThreadBase
is added to manage permissions, volume, routing and wakelocks for activity
on MMAP streams.
- Requests received over MmapStreamInterface to open, start and stop
a MMAP stream are forwarded to audio policy manager so that activity
on MMAP capture and playback streams is visible to audio policy and
taken into account in volume and routing management.
`
Bug: Bug: 33398120
Test: manual test
Change-Id: I957906495fe9277d2972d810b633f50cd1e14ec3
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 3d6571e..cbd7c37 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -543,19 +543,40 @@
void stop_nonvirtual();
};
+ // Mmap stream control interface implementation. Each MmapThreadHandle controls one
+ // MmapPlaybackThread or MmapCaptureThread instance.
+ class MmapThreadHandle : public MmapStreamInterface {
+ public:
+ explicit MmapThreadHandle(const sp<MmapThread>& thread);
+ virtual ~MmapThreadHandle();
+
+ // MmapStreamInterface virtuals
+ virtual status_t createMmapBuffer(int32_t minSizeFrames,
+ struct audio_mmap_buffer_info *info);
+ virtual status_t getMmapPosition(struct audio_mmap_position *position);
+ virtual status_t start(const MmapStreamInterface::Client& client, audio_port_handle_t *handle);
+ virtual status_t stop(audio_port_handle_t handle);
+
+ private:
+ sp<MmapThread> mThread;
+ };
ThreadBase *checkThread_l(audio_io_handle_t ioHandle) const;
PlaybackThread *checkPlaybackThread_l(audio_io_handle_t output) const;
MixerThread *checkMixerThread_l(audio_io_handle_t output) const;
RecordThread *checkRecordThread_l(audio_io_handle_t input) const;
- sp<RecordThread> openInput_l(audio_module_handle_t module,
+ MmapThread *checkMmapThread_l(audio_io_handle_t io) const;
+ VolumeInterface *getVolumeInterface_l(audio_io_handle_t output) const;
+ Vector <VolumeInterface *> getAllVolumeInterfaces_l() const;
+
+ sp<ThreadBase> openInput_l(audio_module_handle_t module,
audio_io_handle_t *input,
audio_config_t *config,
audio_devices_t device,
const String8& address,
audio_source_t source,
audio_input_flags_t flags);
- sp<PlaybackThread> openOutput_l(audio_module_handle_t module,
+ sp<ThreadBase> openOutput_l(audio_module_handle_t module,
audio_io_handle_t *output,
audio_config_t *config,
audio_devices_t devices,
@@ -732,6 +753,12 @@
// list of sessions for which a valid HW A/V sync ID was retrieved from the HAL
DefaultKeyedVector< audio_session_t , audio_hw_sync_t >mHwAvSyncIds;
+
+ // list of MMAP stream control threads. Those threads allow for wake lock, routing
+ // and volume control for activity on the associated MMAP stream at the HAL.
+ // Audio data transfer is directly handled by the client creating the MMAP stream
+ DefaultKeyedVector< audio_io_handle_t, sp<MmapThread> > mMmapThreads;
+
private:
sp<Client> registerPid(pid_t pid); // always returns non-0