commit 90cede87c5a0176574961a4a57589eb217ac1873
author Andreas Huber <andih@google.com> Thu Feb 07 23:25:59 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 07 23:26:00 2013 +0000
tree 83bd670377ac615a4803d9cfb8455bb178ba72e5
parent 1dfc70879323990ba4b4d3e7cadc93ea3900063c
parent c71601c3b1dd63afc9be462194809813e4dbacf1

Merge "Allow for dynamic reconfiguration of the video bitrate used"

media/libstagefright/wifi-display/sink/RTPSink.cpp

diff --git a/media/libstagefright/wifi-display/sink/RTPSink.cpp b/media/libstagefright/wifi-display/sink/RTPSink.cpp
index be54595..3c90a1e 100644
--- a/media/libstagefright/wifi-display/sink/RTPSink.cpp
+++ b/media/libstagefright/wifi-display/sink/RTPSink.cpp
@@ -250,6 +250,8 @@
     : mNetSession(netSession),
       mSurfaceTex(bufferProducer),
       mNotify(notify),
+      mUsingTCPTransport(false),
+      mUsingTCPInterleaving(false),
       mRTPPort(0),
       mRTPSessionID(0),
       mRTCPSessionID(0),
@@ -280,6 +282,9 @@
 }
 
 status_t RTPSink::init(bool usingTCPTransport, bool usingTCPInterleaving) {
+    mUsingTCPTransport = usingTCPTransport;
+    mUsingTCPInterleaving = usingTCPInterleaving;
+
     if (usingTCPInterleaving) {
         return OK;
     }
@@ -717,7 +722,9 @@
             mRTCPSessionID, buf->data(), buf->size());
 #endif
 
-    scheduleSendRR();
+    if (!mUsingTCPTransport) {
+        scheduleSendRR();
+    }
 
     return OK;
 }
@@ -820,6 +827,11 @@
 }
 
 void RTPSink::onPacketLost(const sp<AMessage> &msg) {
+    if (mUsingTCPTransport) {
+        ALOGW("huh? lost a packet even though using reliable transport?");
+        return;
+    }
+
     uint32_t srcId;
     CHECK(msg->findInt32("ssrc", (int32_t *)&srcId));
 

media/libstagefright/wifi-display/sink/RTPSink.h

diff --git a/media/libstagefright/wifi-display/sink/RTPSink.h b/media/libstagefright/wifi-display/sink/RTPSink.h
index f9cbce9..4706c6d 100644
--- a/media/libstagefright/wifi-display/sink/RTPSink.h
+++ b/media/libstagefright/wifi-display/sink/RTPSink.h
@@ -78,6 +78,9 @@
     sp<AMessage> mNotify;
     KeyedVector<uint32_t, sp<Source> > mSources;
 
+    bool mUsingTCPTransport;
+    bool mUsingTCPInterleaving;
+
     int32_t mRTPPort;
 
     int32_t mRTPSessionID;   // in TCP unicast mode these are just server