commit fbb70ce416b193655fbe5ff7f6c8676050bdf524
author Chong Zhang <chz@google.com> Fri May 31 03:22:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 03:22:49 2013 +0000
tree 62ace93ba0072ae663dbbc6a1896b88055196dca
parent aa603c40dadca5d6886ea0e7a39a91aeadd9615f
parent bd25dacce1187c827dde3fb72036c044c8106719

Merge "wifi-display: fixes for PAUSE/PLAY state"

media/libstagefright/wifi-display/source/WifiDisplaySource.cpp

diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
index 0b714f0..dee95eb 100644
--- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
+++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
@@ -1369,7 +1369,9 @@
         return ERROR_MALFORMED;
     }
 
-    if (mState != AWAITING_CLIENT_PLAY) {
+    if (mState != AWAITING_CLIENT_PLAY
+     && mState != PAUSED_TO_PLAYING
+     && mState != PAUSED) {
         ALOGW("Received PLAY request but we're in state %d", mState);
 
         sendErrorResponse(
@@ -1396,7 +1398,7 @@
         return err;
     }
 
-    if (mState == PAUSED_TO_PLAYING) {
+    if (mState == PAUSED_TO_PLAYING || mPlaybackSessionEstablished) {
         mState = PLAYING;
         return OK;
     }
@@ -1430,7 +1432,7 @@
 
     ALOGI("Received PAUSE request.");
 
-    if (mState != PLAYING_TO_PAUSED) {
+    if (mState != PLAYING_TO_PAUSED && mState != PLAYING) {
         return INVALID_OPERATION;
     }