diff options
| author | Wei Jia <wjia@google.com> | 2015-10-13 21:33:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-13 21:33:29 +0000 |
| commit | 780b766d823040e2d015529e5529c83a008442cc (patch) | |
| tree | 6a804f039d2829d2a1762366d65bbacfbe2f2d37 /media | |
| parent | b3c483098e1955202ea08f41d468eb78635e86e0 (diff) | |
| parent | 842396584c80d352c9aa7ea249399102155df49b (diff) | |
| download | frameworks_av-780b766d823040e2d015529e5529c83a008442cc.zip frameworks_av-780b766d823040e2d015529e5529c83a008442cc.tar.gz frameworks_av-780b766d823040e2d015529e5529c83a008442cc.tar.bz2 | |
Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 7370224..478d310 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -362,9 +362,9 @@ bool NuPlayerDriver::isPlaying() { } status_t NuPlayerDriver::setPlaybackSettings(const AudioPlaybackRate &rate) { - Mutex::Autolock autoLock(mLock); status_t err = mPlayer->setPlaybackSettings(rate); if (err == OK) { + Mutex::Autolock autoLock(mLock); if (rate.mSpeed == 0.f && mState == STATE_RUNNING) { mState = STATE_PAUSED; // try to update position |