commit 58d315cae745aae2c87eb3e7cac2da5e25a57d4c
author Andy Hung <hunga@google.com> Fri Sep 11 18:44:56 2015 -0700
committer Andy Hung <hunga@google.com> Mon Sep 14 23:06:14 2015 +0000
tree 2eadd2314cde3a647d9888b10af15c570f5f2f81
parent 15609188082d0707ce369884ae8bf80dbc84bbf7

NuPlayerRenderer: Do not drain audio during teardown

Bug: 23748678
Change-Id: I8b65786f25f4524e5e2e9476ecc2a4f4ab3aea9e

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index fbe463b..d628e14 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -822,6 +822,10 @@
 }
 
 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.
@@ -1527,6 +1531,7 @@
         cancelAudioOffloadPauseTimeout();
         status_t err = mAudioSink->start();
         if (err != OK) {
+            ALOGE("cannot start AudioSink err %d", err);
             notifyAudioTearDown();
         }
     }