| commit | ea9d51bd710e6739077a3700f27a1c37767a2f6d | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Nov 30 09:53:40 2011 -0800 |
| committer | Andreas Huber <andih@google.com> | Wed Nov 30 09:53:40 2011 -0800 |
| tree | bd2df5e1d9f4f5a95976779aa7f73d7e4989c6c3 | |
| parent | 37a153f450cb8550fe64a1bf62366cf5e944d6ab [diff] [blame] | |
| parent | 8a1fac32b307cfa096b343f219d471365b657ad8 [diff] [blame] |
resolved conflicts for merge of 3d630e86 to master Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 1731728..d0d9ca6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -628,11 +628,16 @@ mAudioSink->pause(); } + ALOGV("now paused audio queue has %d entries, video has %d entries", + mAudioQueue.size(), mVideoQueue.size()); + mPaused = true; } void NuPlayer::Renderer::onResume() { - CHECK(mPaused); + if (!mPaused) { + return; + } if (mHasAudio) { mAudioSink->start();