diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-22 18:14:02 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-23 17:44:57 -0700 |
| commit | 2650e9661ea1608dfb6b58bc640a66cdbbb6ae58 (patch) | |
| tree | 70b66e87a1061e0b842ca054ca3482950c69ed0e /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 70c1f74f3d4c43b67949f3e742195d60f4677462 (diff) | |
| download | frameworks_av-2650e9661ea1608dfb6b58bc640a66cdbbb6ae58.zip frameworks_av-2650e9661ea1608dfb6b58bc640a66cdbbb6ae58.tar.gz frameworks_av-2650e9661ea1608dfb6b58bc640a66cdbbb6ae58.tar.bz2 | |
MediaPlayerService: prevent audio_attributes_t race conditions
Access to audio attributes fields in Client and AudioOutput
was not always locked.
Audio attributes field in AudioOutput cannot share the same pointer
as Client because it can be indepently accessed. Save the
attributes inside AudioOutput instead.
Bug 22672670
Change-Id: Ib1002b57b45cea44ff5e6eb115d581dc3beec006
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 1c32597..60d4617 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -142,7 +142,7 @@ class MediaPlayerService : public BnMediaPlayerService CallbackData * mCallbackData; uint64_t mBytesWritten; audio_stream_type_t mStreamType; - const audio_attributes_t *mAttributes; + audio_attributes_t * mAttributes; float mLeftVolume; float mRightVolume; AudioPlaybackRate mPlaybackRate; |