diff options
author | Marco Nelissen <marcone@google.com> | 2014-11-12 23:39:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 23:39:19 +0000 |
commit | cea67364cee2c8e2e9baae86276cdeb0e13c8c0d (patch) | |
tree | 967ff03fb467563be44b555d1f1b3422e951b18c /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
parent | 3584a1afb3f263a13d12cc2d8003101c74453ce3 (diff) | |
parent | 233ef4967d3d95ef46313b9d5d272d6fe0d49209 (diff) | |
download | frameworks_av-cea67364cee2c8e2e9baae86276cdeb0e13c8c0d.zip frameworks_av-cea67364cee2c8e2e9baae86276cdeb0e13c8c0d.tar.gz frameworks_av-cea67364cee2c8e2e9baae86276cdeb0e13c8c0d.tar.bz2 |
am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 538596f
* commit '233ef4967d3d95ef46313b9d5d272d6fe0d49209':
Fix looping sound playback
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 5 |
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; } |