diff options
| author | Andreas Huber <andih@google.com> | 2012-10-31 13:18:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 13:18:27 -0700 |
| commit | 6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007 (patch) | |
| tree | f4819a665ea2c6e8a3ad9727b17581e483ecc237 /media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | |
| parent | f0e55de3b1b099c413d430d8f9d46361454c85d2 (diff) | |
| parent | 90a92053219ae50ddf4bb54e3d54db2d309e2b8d (diff) | |
| download | frameworks_av-6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007.zip frameworks_av-6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007.tar.gz frameworks_av-6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007.tar.bz2 | |
am 90a92053: Various tweaks to wfd
* commit '90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
Diffstat (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.cpp')
| -rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index cba1043..b16c5d0 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -22,6 +22,7 @@ #include "PlaybackSession.h" #include "Parameters.h" #include "ParsedMessage.h" +#include "Sender.h" #include <binder/IServiceManager.h> #include <gui/ISurfaceTexture.h> @@ -981,8 +982,7 @@ status_t WifiDisplaySource::onSetupRequest( return ERROR_MALFORMED; } - PlaybackSession::TransportMode transportMode = - PlaybackSession::TRANSPORT_UDP; + Sender::TransportMode transportMode = Sender::TRANSPORT_UDP; int clientRtp, clientRtcp; if (transport.startsWith("RTP/AVP/TCP;")) { @@ -991,7 +991,7 @@ status_t WifiDisplaySource::onSetupRequest( transport.c_str(), "interleaved", &interleaved) && sscanf(interleaved.c_str(), "%d-%d", &clientRtp, &clientRtcp) == 2) { - transportMode = PlaybackSession::TRANSPORT_TCP_INTERLEAVED; + transportMode = Sender::TRANSPORT_TCP_INTERLEAVED; } else { bool badRequest = false; @@ -1013,7 +1013,7 @@ status_t WifiDisplaySource::onSetupRequest( return ERROR_MALFORMED; } - transportMode = PlaybackSession::TRANSPORT_TCP; + transportMode = Sender::TRANSPORT_TCP; } } else if (transport.startsWith("RTP/AVP;unicast;") || transport.startsWith("RTP/AVP/UDP;unicast;")) { @@ -1101,7 +1101,7 @@ status_t WifiDisplaySource::onSetupRequest( AString response = "RTSP/1.0 200 OK\r\n"; AppendCommonResponse(&response, cseq, playbackSessionID); - if (transportMode == PlaybackSession::TRANSPORT_TCP_INTERLEAVED) { + if (transportMode == Sender::TRANSPORT_TCP_INTERLEAVED) { response.append( StringPrintf( "Transport: RTP/AVP/TCP;interleaved=%d-%d;", @@ -1110,7 +1110,7 @@ status_t WifiDisplaySource::onSetupRequest( int32_t serverRtp = playbackSession->getRTPPort(); AString transportString = "UDP"; - if (transportMode == PlaybackSession::TRANSPORT_TCP) { + if (transportMode == Sender::TRANSPORT_TCP) { transportString = "TCP"; } |