diff options
author | Andreas Huber <andih@google.com> | 2012-10-01 11:26:30 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2012-10-01 11:26:30 -0700 |
commit | ad0d97c7cf620e96a0b088dd9461645a3f8900b7 (patch) | |
tree | 83c354a2a43102ce1e58a191c1abc41b19b4dd69 /media/libstagefright/wifi-display/source/PlaybackSession.cpp | |
parent | 0e1d71641624c641a0a1abe4098943f5a42c6f94 (diff) |
Perform an orderly shutdown if possible, force disconnect if necessary
wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.
Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug: 7258622
Diffstat (limited to 'media/libstagefright/wifi-display/source/PlaybackSession.cpp')
-rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index c8b9afd8..9c065b28 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -173,13 +173,11 @@ status_t WifiDisplaySource::PlaybackSession::Track::start() { void WifiDisplaySource::PlaybackSession::Track::stopAsync() { ALOGV("Track::stopAsync isAudio=%d", mIsAudio); - CHECK(mStarted); - mConverter->shutdownAsync(); sp<AMessage> msg = new AMessage(kWhatMediaPullerStopped, id()); - if (mMediaPuller != NULL) { + if (mStarted && mMediaPuller != NULL) { mMediaPuller->stopAsync(msg); } else { msg->post(); |