Changeset 118 for trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

Timestamp:

09/02/10 22:32:44 (21 months ago)

Author:

shiretu

Message:

-- android related stuff

File:

• trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp (modified) (9 diffs)

trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

@@ -80 +80 @@
 OutboundConnectivity::OutboundConnectivity()
 : BaseConnectivity() {
-        _nextRTCPIncrement = 1000.00;
-
         _videoDataFd = -1;
         _videoDataPort = 0;
@@ -89 +87 @@
         _videoBytesCount = 0;
         _videoFirstRtp = 0;
-        _videoNextRTCPTs = _nextRTCPIncrement;
+        _videoRtpTs = 0;
+        _videoRtcpSent = false;
 
         _audioDataFd = -1;
@@ -98 +97 @@
         _audioBytesCount = 0;
         _audioFirstRtp = 0;
-        _audioNextRTCPTs = _nextRTCPIncrement;
+        _videoRtpTs = 0;
+        _audioRtcpSent = false;
 
         _pOutStream = NULL;
@@ -151 +151 @@
                 return _pOutStream->SSRC();
         return 0;
+}
+
+uint16_t OutboundConnectivity::GetLastVideoSequence() {
+        return _pOutStream->VideoCounter();
+}
+
+uint32_t OutboundConnectivity::GetLastVideoRTPTimestamp() {
+        return _videoRtpTs;
+}
+
+uint16_t OutboundConnectivity::GetLastAudioSequence() {
+        return _pOutStream->AudioCounter();
+}
+
+uint32_t OutboundConnectivity::GetLastAudioRTPTimestamp() {
+        return _audioRtpTs;
 }
 
@@ -231 +247 @@
 
 bool OutboundConnectivity::FeedVideoData(msghdr &message) {
+        _videoRtpTs = ntohlp(((uint8_t *) message.msg_iov[0].iov_base) + 4);
         if (!FeedVideoDataUDP(message)) {
                 FATAL("Unable to feed video UDP clients");
@@ -244 +261 @@
 
 bool OutboundConnectivity::FeedAudioData(msghdr &message) {
+        _audioRtpTs = ntohlp(((uint8_t *) message.msg_iov[0].iov_base) + 4);
         if (!FeedAudioDataUDP(message)) {
                 FATAL("Unable to feed audio UDP clients");
@@ -390 +408 @@
                 uint32_t ssrc, uint32_t rate, uint32_t packetsCount, uint32_t bytesCount,
                 bool isAudio) {
-        
+
         /*
          0                   1                   2                   3
@@ -481 +499 @@
 }
 
+bool OutboundConnectivity::CreateRTCPPacket_mystyle_only_once(uint8_t *pDest, uint8_t *pSrc,
+                uint32_t ssrc, uint32_t rate, uint32_t packetsCount,
+                uint32_t bytesCount, bool isAudio) {
+        bool &rtcpSent = isAudio ? _audioRtcpSent : _videoRtcpSent;
+        if (rtcpSent)
+                return false;
+
+        rtcpSent = CreateRTCPPacket_mystyle(pDest, pSrc, ssrc, rate, packetsCount,
+                        bytesCount, isAudio);
+        return rtcpSent;
+}
+
 bool OutboundConnectivity::CreateRTCPPacket_live555style(uint8_t *pDest, uint8_t *pSrc,
                 uint32_t ssrc, uint32_t rate, uint32_t packetsCount, uint32_t bytesCount,
@@ -536 +566 @@
         return true;
 }
+
 bool OutboundConnectivity::CreateRTCPPacket_none(uint8_t *pDest, uint8_t *pSrc,
-                        uint32_t ssrc, uint32_t rate, uint32_t packetsCount,
-                        uint32_t bytesCount, bool isAudio){
+                uint32_t ssrc, uint32_t rate, uint32_t packetsCount,
+                uint32_t bytesCount, bool isAudio) {
         return false;
 }