commit 4561dc621e893c0a8ae4d71441a1dfcd1cb20594
author Linux Build Service Account <lnxbuild@localhost> Thu May 21 19:57:37 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 21 19:57:37 2015 -0700
tree 029a21c1f9ba60f10e16ed99f13fa300f489aa45
parent 95f70a07826b72e547926fa670e9079b0462d29d
parent 970b5b3daa539a7289f030576a1a67d94fee9eb7

Merge "mm-dash: handle flushcompleted state check"

dashplayer/DashPlayer.cpp

diff --git a/dashplayer/DashPlayer.cpp b/dashplayer/DashPlayer.cpp
index 351a680..54e77f0 100644
--- a/dashplayer/DashPlayer.cpp
+++ b/dashplayer/DashPlayer.cpp
@@ -589,11 +589,13 @@
                 bool needShutdown = false;
 
                 if (track == kAudio) {
-                    CHECK(IsFlushingState(mFlushingAudio, &needShutdown));
-                    mFlushingAudio = FLUSHED;
+                    if(IsFlushingState(mFlushingAudio, &needShutdown)) {
+                        mFlushingAudio = FLUSHED;
+                    }
                 } else if (track == kVideo){
-                    CHECK(IsFlushingState(mFlushingVideo, &needShutdown));
-                    mFlushingVideo = FLUSHED;
+                    if(IsFlushingState(mFlushingVideo, &needShutdown)) {
+                        mFlushingVideo = FLUSHED;
+                    }
 
                     mVideoLateByUs = 0;
                 }