diff options
author | Andy Hung <hunga@google.com> | 2015-09-15 17:35:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-15 17:35:22 +0000 |
commit | 82b34505323c095c800f6620a09fd58a17016699 (patch) | |
tree | 0de30b915445825291098e07eb3ba44dcd36c4c0 /media/libmediaplayerservice/nuplayer | |
parent | 6d0473ee9faf6a6e245e83088db91cd993e8facb (diff) | |
parent | 3f5ff68327b1df21196f18a020aec474a0dd95fe (diff) | |
download | frameworks_av-82b34505323c095c800f6620a09fd58a17016699.zip frameworks_av-82b34505323c095c800f6620a09fd58a17016699.tar.gz frameworks_av-82b34505323c095c800f6620a09fd58a17016699.tar.bz2 |
Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index bca2888..776dba8 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -807,6 +807,10 @@ void NuPlayer::Renderer::drainAudioQueueUntilLastEOS() { } bool NuPlayer::Renderer::onDrainAudioQueue() { + // do not drain audio during teardown as queued buffers may be invalid. + if (mAudioTornDown) { + return false; + } // TODO: This call to getPosition checks if AudioTrack has been created // in AudioSink before draining audio. If AudioTrack doesn't exist, then // CHECKs on getPosition will fail. @@ -1494,6 +1498,7 @@ void NuPlayer::Renderer::onResume() { cancelAudioOffloadPauseTimeout(); status_t err = mAudioSink->start(); if (err != OK) { + ALOGE("cannot start AudioSink err %d", err); notifyAudioTearDown(); } } |