diff options
author | Andreas Huber <andih@google.com> | 2012-08-30 14:51:40 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2012-08-30 14:51:40 -0700 |
commit | bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9 (patch) | |
tree | 12db95dcd0186648022458280b950cf4aa154849 /media/libmediaplayerservice/MediaPlayerService.cpp | |
parent | 86b1961a8d61086ef8d5475182f2a3cf4392b42c (diff) | |
download | frameworks_av-bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9.zip frameworks_av-bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9.tar.gz frameworks_av-bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9.tar.bz2 |
Only run the wifi display RTSP server on demand, and only on the wifi direct
interface.
Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 5fe446f..166bae9 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -279,13 +279,17 @@ sp<ICrypto> MediaPlayerService::makeCrypto() { return new Crypto; } -status_t MediaPlayerService::enableRemoteDisplay(bool enable) { +status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { Mutex::Autolock autoLock(mLock); - if (enable && mRemoteDisplay == NULL) { + if (iface != NULL) { + if (mRemoteDisplay != NULL) { + return INVALID_OPERATION; + } + mRemoteDisplay = new RemoteDisplay; - status_t err = mRemoteDisplay->start(); + status_t err = mRemoteDisplay->start(iface); if (err != OK) { mRemoteDisplay.clear(); @@ -293,7 +297,9 @@ status_t MediaPlayerService::enableRemoteDisplay(bool enable) { } return OK; - } else if (!enable && mRemoteDisplay != NULL) { + } + + if (mRemoteDisplay != NULL) { mRemoteDisplay->stop(); mRemoteDisplay.clear(); } |