summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/wifi-display/MediaSender.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-03-22 09:56:29 -0700
committerAndreas Huber <andih@google.com>2013-03-25 10:36:33 -0700
commit6e98aba4d23d00cab236d993d895f57ea76ea0e5 (patch)
treea166df2eae20c39768fa13c5b803a246275de5b8 /media/libstagefright/wifi-display/MediaSender.cpp
parenta97d15e2e2f0b317a345d3a6f02df80b8988b1f6 (diff)
downloadframeworks_av-6e98aba4d23d00cab236d993d895f57ea76ea0e5.zip
frameworks_av-6e98aba4d23d00cab236d993d895f57ea76ea0e5.tar.gz
frameworks_av-6e98aba4d23d00cab236d993d895f57ea76ea0e5.tar.bz2
Separate the mode of the RTP and RTCP channels.
I now can use a TCP reliable data channel with a UDP back channel. Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
Diffstat (limited to 'media/libstagefright/wifi-display/MediaSender.cpp')
-rw-r--r--media/libstagefright/wifi-display/MediaSender.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/MediaSender.cpp b/media/libstagefright/wifi-display/MediaSender.cpp
index d13a92e..6fc50f7 100644
--- a/media/libstagefright/wifi-display/MediaSender.cpp
+++ b/media/libstagefright/wifi-display/MediaSender.cpp
@@ -124,10 +124,14 @@ status_t MediaSender::initAsync(
looper()->registerHandler(mTSSender);
err = mTSSender->initAsync(
- transportMode,
remoteHost,
remoteRTPPort,
+ transportMode, // rtpMode
remoteRTCPPort,
+ (transportMode == RTPSender::TRANSPORT_UDP
+ && remoteRTCPPort >= 0)
+ ? transportMode
+ : RTPSender::TRANSPORT_NONE, // rtcpMode
localRTPPort);
if (err != OK) {
@@ -174,10 +178,13 @@ status_t MediaSender::initAsync(
looper()->registerHandler(info->mSender);
status_t err = info->mSender->initAsync(
- transportMode,
remoteHost,
remoteRTPPort,
+ transportMode, // rtpMode
remoteRTCPPort,
+ (transportMode == RTPSender::TRANSPORT_UDP && remoteRTCPPort >= 0)
+ ? transportMode
+ : RTPSender::TRANSPORT_NONE, // rtcpMode
localRTPPort);
if (err != OK) {