OSDN Git Service

NuPlayer: change assert to conditional check.
authorWei Jia <wjia@google.com>
Tue, 23 Sep 2014 17:55:35 +0000 (10:55 -0700)
committerWei Jia <wjia@google.com>
Tue, 23 Sep 2014 20:53:58 +0000 (13:53 -0700)
Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

index b589909..2ea12ae 100644 (file)
@@ -984,17 +984,31 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
 
         case kWhatPause:
         {
-            CHECK(mRenderer != NULL);
-            mSource->pause();
-            mRenderer->pause();
+            if (mSource != NULL) {
+                mSource->pause();
+            } else {
+                ALOGW("pause called when source is gone or not set");
+            }
+            if (mRenderer != NULL) {
+                mRenderer->pause();
+            } else {
+                ALOGW("pause called when renderer is gone or not set");
+            }
             break;
         }
 
         case kWhatResume:
         {
-            CHECK(mRenderer != NULL);
-            mSource->resume();
-            mRenderer->resume();
+            if (mSource != NULL) {
+                mSource->resume();
+            } else {
+                ALOGW("resume called when source is gone or not set");
+            }
+            if (mRenderer != NULL) {
+                mRenderer->resume();
+            } else {
+                ALOGW("resume called when renderer is gone or not set");
+            }
             break;
         }