summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-07-14 00:10:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-14 00:10:04 +0000
commitdb350735e14c13c4fc1094768bfbbad4dab8ef2c (patch)
treecad630fd478f7b104eeff82bc29ca643ce69d0b1 /media/libmediaplayerservice/nuplayer
parent4b33e0838fdb1b5e545449add02005916b512c99 (diff)
parent3b0cd26dbb0ce37d220db9ff0fa8172a7ef1c5cb (diff)
downloadframeworks_av-db350735e14c13c4fc1094768bfbbad4dab8ef2c.zip
frameworks_av-db350735e14c13c4fc1094768bfbbad4dab8ef2c.tar.gz
frameworks_av-db350735e14c13c4fc1094768bfbbad4dab8ef2c.tar.bz2
Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 7e55aac..13a7d94 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -266,6 +266,7 @@ void NuPlayer::Renderer::flush(bool audio, bool notifyComplete) {
Mutex::Autolock autoLock(mLock);
if (audio) {
mNotifyCompleteAudio |= notifyComplete;
+ clearAudioFirstAnchorTime_l();
++mAudioQueueGeneration;
++mAudioDrainGeneration;
} else {
@@ -275,7 +276,6 @@ void NuPlayer::Renderer::flush(bool audio, bool notifyComplete) {
}
clearAnchorTime_l();
- clearAudioFirstAnchorTime_l();
mVideoLateByUs = 0;
mSyncQueues = false;
}