From de3b1c01146d2103f6bf56e2659a9c650734945a Mon Sep 17 00:00:00 2001 From: Haynes Mathew George Date: Tue, 8 Dec 2015 15:11:51 -0800 Subject: audiopolicy: Handle startOutput on output command thread Handle startOutput on AudioPolicyService output command thread to serialize with concurrent releaseOutput/stopOutput calls. CRs-Fixed: 944129 Change-Id: Ie333c736750c7dfb31d3036d79dfff13cd0486fc --- services/audiopolicy/service/AudioPolicyService.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'services/audiopolicy/service/AudioPolicyService.h') diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h index a0d5aa2..d11294b 100644 --- a/services/audiopolicy/service/AudioPolicyService.h +++ b/services/audiopolicy/service/AudioPolicyService.h @@ -202,6 +202,9 @@ public: audio_io_handle_t *handle); virtual status_t stopAudioSource(audio_io_handle_t handle); + status_t doStartOutput(audio_io_handle_t output, + audio_stream_type_t stream, + audio_session_t session); status_t doStopOutput(audio_io_handle_t output, audio_stream_type_t stream, audio_session_t session); @@ -249,6 +252,7 @@ private: SET_VOLUME, SET_PARAMETERS, SET_VOICE_VOLUME, + START_OUTPUT, STOP_OUTPUT, RELEASE_OUTPUT, CREATE_AUDIO_PATCH, @@ -277,6 +281,9 @@ private: status_t parametersCommand(audio_io_handle_t ioHandle, const char *keyValuePairs, int delayMs = 0); status_t voiceVolumeCommand(float volume, int delayMs = 0); + status_t startOutputCommand(audio_io_handle_t output, + audio_stream_type_t stream, + audio_session_t session); void stopOutputCommand(audio_io_handle_t output, audio_stream_type_t stream, audio_session_t session); @@ -349,6 +356,13 @@ private: float mVolume; }; + class StartOutputData : public AudioCommandData { + public: + audio_io_handle_t mIO; + audio_stream_type_t mStream; + audio_session_t mSession; + }; + class StopOutputData : public AudioCommandData { public: audio_io_handle_t mIO; -- cgit v1.1