diff options
| author | Wei Jia <wjia@google.com> | 2015-07-11 01:16:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-11 01:16:10 +0000 |
| commit | 9ad9e7471629f7b9061569a50555a1722047f38d (patch) | |
| tree | e08e0be37c33e86f12434b097edd536a1c58c4a9 /media/libmediaplayerservice | |
| parent | 1ec856e6e0955a3cc09fb5aae920aa1b3329773b (diff) | |
| parent | c6e58419e00e6d04882a885101510e667d9c043a (diff) | |
| download | frameworks_av-9ad9e7471629f7b9061569a50555a1722047f38d.zip frameworks_av-9ad9e7471629f7b9061569a50555a1722047f38d.tar.gz frameworks_av-9ad9e7471629f7b9061569a50555a1722047f38d.tar.bz2 | |
Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index a9d8904..4a1a34d 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -639,7 +639,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { mDeferredActions.push_back(new SetSurfaceAction(surface)); - if (obj != NULL) { + if (obj != NULL || mAudioDecoder != NULL) { if (mStarted) { // Issue a seek to refresh the video screen only if started otherwise // the extractor may not yet be started and will assert. |