Bump to 2015.08.07

nomoretime-cell · Aug 15, 2015 · b8cde65 · b8cde65
1 parent 8dde202
commit b8cde65
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 deletions.
diff --git a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
@@ -4,7 +4,7 @@
 #ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
 #define _BASICUSAGEENVIRONMENT_VERSION_HH
 
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2015.07.31"
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1438300800
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2015.08.07"
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1438905600
 
 #endif
diff --git a/UsageEnvironment/include/UsageEnvironment_version.hh b/UsageEnvironment/include/UsageEnvironment_version.hh
@@ -4,7 +4,7 @@
 #ifndef _USAGEENVIRONMENT_VERSION_HH
 #define _USAGEENVIRONMENT_VERSION_HH
 
-#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2015.07.31"
-#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1438300800
+#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2015.08.07"
+#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1438905600
 
 #endif
diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
@@ -3,9 +3,9 @@
 # At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0
 # One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
 
-libliveMedia_VERSION_CURRENT=49
-libliveMedia_VERSION_REVISION=2
-libliveMedia_VERSION_AGE=0
+libliveMedia_VERSION_CURRENT=50
+libliveMedia_VERSION_REVISION=1
+libliveMedia_VERSION_AGE=1
 libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
 
 libBasicUsageEnvironment_VERSION_CURRENT=1

diff --git a/groupsock/include/groupsock_version.hh b/groupsock/include/groupsock_version.hh
@@ -4,7 +4,7 @@
 #ifndef _GROUPSOCK_VERSION_HH
 #define _GROUPSOCK_VERSION_HH
 
-#define GROUPSOCK_LIBRARY_VERSION_STRING	"2015.07.31"
-#define GROUPSOCK_LIBRARY_VERSION_INT		1438300800
+#define GROUPSOCK_LIBRARY_VERSION_STRING	"2015.08.07"
+#define GROUPSOCK_LIBRARY_VERSION_INT		1438905600
 
 #endif
diff --git a/liveMedia/RTCP.cpp b/liveMedia/RTCP.cpp
@@ -183,13 +183,19 @@ RTCPInstance::~RTCPInstance() {
 #ifdef DEBUG
   fprintf(stderr, "RTCPInstance[%p]::~RTCPInstance()\n", this);
 #endif
-  if (fSource != NULL) fSource->deregisterForMultiplexedRTCPPackets();
-
   // Begin by sending a BYE.  We have to do this immediately, without
   // 'reconsideration', because "this" is going away.
   fTypeOfEvent = EVENT_BYE; // not used, but...
   sendBYE();
 
+  if (fSource != NULL && fSource->RTPgs() == fRTCPInterface.gs()) {
+    // We were receiving RTCP reports that were multiplexed with RTP, so tell the RTP source
+    // to stop giving them to us:
+    fSource->deregisterForMultiplexedRTCPPackets();
+    fRTCPInterface.forgetOurGroupsock();
+      // so that the "fRTCPInterface" destructor doesn't turn off background read handling
+  }
+
   if (fSpecificRRHandlerTable != NULL) {
     AddressPortLookupTable::Iterator iter(*fSpecificRRHandlerTable);
     RRHandlerRecord* rrHandler;
@@ -928,7 +934,8 @@ Boolean RTCPInstance::addReport(Boolean alwaysAdd) {
     }
 
     addSR();
-  } else if (fSource != NULL) {
+  }
+  if (fSource != NULL) {
     if (!alwaysAdd) {
       if (!fSource->enableRTCPReports()) return False;
     }

diff --git a/liveMedia/RTPInterface.cpp b/liveMedia/RTPInterface.cpp
@@ -297,7 +297,7 @@ Boolean RTPInterface::handleRead(unsigned char* buffer, unsigned bufferMaxSize,
 
 void RTPInterface::stopNetworkReading() {
   // Normal case
-  envir().taskScheduler().turnOffBackgroundReadHandling(fGS->socketNum());
+  if (fGS != NULL) envir().taskScheduler().turnOffBackgroundReadHandling(fGS->socketNum());
 
   // Also turn off read handling on each of our TCP connections:
   for (tcpStreamRecord* streams = fTCPStreams; streams != NULL; streams = streams->fNext) {

diff --git a/liveMedia/RTPSink.cpp b/liveMedia/RTPSink.cpp
@@ -69,6 +69,9 @@ RTPSink::RTPSink(UsageEnvironment& env,
 RTPSink::~RTPSink() {
   delete fTransmissionStatsDB;
   delete[] (char*)fRTPPayloadFormatName;
+  fRTPInterface.forgetOurGroupsock();
+    // so that the "fRTCPInterface" destructor doesn't turn off background read handling (in case
+    // its 'groupsock' is being shared with something else that does background read handling).
 }
 
 u_int32_t RTPSink::convertToRTPTimestamp(struct timeval tv) {

diff --git a/liveMedia/include/RTPInterface.hh b/liveMedia/include/RTPInterface.hh
@@ -76,6 +76,8 @@ public:
 		     Boolean& packetReadWasIncomplete);
   // Note: If "tcpSocketNum" < 0, then the packet was received over UDP, and "tcpStreamChannelId"
   //   is undefined (and irrelevant).
+
+
   // Otherwise (if "tcpSocketNum" >= 0), the packet was received (interleaved) over TCP, and
   //   "tcpStreamChannelId" will return the channel id.
 
@@ -89,6 +91,11 @@ public:
     fAuxReadHandlerClientData = handlerClientData;
   }
 
+  void forgetOurGroupsock() { fGS = NULL; }
+    // This may be called - *only immediately prior* to deleting this - to prevent our destructor
+    // from turning off background reading on the 'groupsock'.  (This is in case the 'groupsock'
+    // is also being read from elsewhere.)
+
 private:
   // Helper functions for sending a RTP or RTCP packet over a TCP connection:
   Boolean sendRTPorRTCPPacketOverTCP(unsigned char* packet, unsigned packetSize,

diff --git a/liveMedia/include/liveMedia_version.hh b/liveMedia/include/liveMedia_version.hh
@@ -4,7 +4,7 @@
 #ifndef _LIVEMEDIA_VERSION_HH
 #define _LIVEMEDIA_VERSION_HH
 
-#define LIVEMEDIA_LIBRARY_VERSION_STRING	"2015.07.31"
-#define LIVEMEDIA_LIBRARY_VERSION_INT		1438300800
+#define LIVEMEDIA_LIBRARY_VERSION_STRING	"2015.08.07"
+#define LIVEMEDIA_LIBRARY_VERSION_INT		1438905600
 
 #endif