summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-12 19:00:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-12 19:00:29 +0000
commit538596f71dc667b2f39c27d0bc9bbf119b0e6d58 (patch)
treea02a7204a9d6c323b7d7bfcf3f108933e9cd5dc8 /media
parent745602d87607521f4fe84c4f3a6388fbdb6a867c (diff)
parent368e33700ed16acc8e99657fb84edd5d2806b34f (diff)
downloadframeworks_av-538596f71dc667b2f39c27d0bc9bbf119b0e6d58.zip
frameworks_av-538596f71dc667b2f39c27d0bc9bbf119b0e6d58.tar.gz
frameworks_av-538596f71dc667b2f39c27d0bc9bbf119b0e6d58.tar.bz2
Merge "Fix looping sound playback" into lmp-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index b9a1a6c..b42b480 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -628,6 +628,11 @@ void NuPlayerDriver::notifyListener_l(
if (mLooping || (mAutoLoop
&& (mAudioSink == NULL || mAudioSink->realtime()))) {
mPlayer->seekToAsync(0);
+ if (mAudioSink != NULL) {
+ // The renderer has stopped the sink at the end in order to play out
+ // the last little bit of audio. If we're looping, we need to restart it.
+ mAudioSink->start();
+ }
break;
}