diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-12 23:58:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 23:58:40 +0000 |
| commit | 6e100e42872aa039900959760cfd046eb358d607 (patch) | |
| tree | e96982a6ba31973bea7591357274d4e9043f3a34 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | dfdd3168582ffa72ecfc76c9530a8ea60540f8d2 (diff) | |
| parent | cea67364cee2c8e2e9baae86276cdeb0e13c8c0d (diff) | |
| download | frameworks_av-6e100e42872aa039900959760cfd046eb358d607.zip frameworks_av-6e100e42872aa039900959760cfd046eb358d607.tar.gz frameworks_av-6e100e42872aa039900959760cfd046eb358d607.tar.bz2 | |
am cea67364: am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 538596f
* commit 'cea67364cee2c8e2e9baae86276cdeb0e13c8c0d':
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 2b1c559..e3ccab2 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -636,6 +636,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; } |