Changeset 107

Timestamp:

08/26/10 21:20:12 (18 months ago)

Author:

shiretu

Message:

-- added second implementation for RTCP packets

Location:

trunk/sources/thelib

Files:

• include/protocols/rtp/connectivity/outboundconnectivity.h (modified) (4 diffs)
• src/protocols/rtp/connectivity/outboundconnectivity.cpp (modified) (6 diffs)

trunk/sources/thelib/include/protocols/rtp/connectivity/outboundconnectivity.h

@@ -36 +36 @@
         uint32_t _videoBytesCount;
         uint32_t _videoFirstRtp;
+        double _videoNextRTCPTs;
         map<uint32_t, sockaddr_in> _udpVideoDataClients;
         map<uint32_t, sockaddr_in> _udpVideoRTCPClients;
@@ -46 +47 @@
         uint32_t _audioBytesCount;
         uint32_t _audioFirstRtp;
+        double _audioNextRTCPTs;
         map<uint32_t, sockaddr_in> _udpAudioDataClients;
         map<uint32_t, sockaddr_in> _udpAudioRTCPClients;
@@ -53 +55 @@
         msghdr _message;
         double _startupTime;
+        double _nextRTCPIncrement;
 public:
         OutboundConnectivity();
@@ -87 +90 @@
         bool FeedAudioDataUDP(msghdr &message);
         bool FeedAudioDataTCP(msghdr &message);
-        bool CreateRTCPPacket(uint8_t *pDest, uint8_t *pSrc,
+        bool CreateRTCPPacket_mystyle(uint8_t *pDest, uint8_t *pSrc,
+                        uint32_t ssrc, uint32_t rate, uint32_t packetsCount,
+                        uint32_t bytesCount, bool isAudio);
+        bool CreateRTCPPacket_live555style(uint8_t *pDest, uint8_t *pSrc,
                         uint32_t ssrc, uint32_t rate, uint32_t packetsCount,
                         uint32_t bytesCount, bool isAudio);

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

@@ -78 +78 @@
 while (0)
 
+//#define CreateRTCPPacket CreateRTCPPacket_mystyle
+#define CreateRTCPPacket CreateRTCPPacket_live555style
+
 OutboundConnectivity::OutboundConnectivity()
 : BaseConnectivity() {
+        _nextRTCPIncrement = 1000.00;
+
         _videoDataFd = -1;
         _videoDataPort = 0;
@@ -87 +92 @@
         _videoBytesCount = 0;
         _videoFirstRtp = 0;
+        _videoNextRTCPTs = _nextRTCPIncrement;
 
         _audioDataFd = -1;
@@ -95 +101 @@
         _audioBytesCount = 0;
         _audioFirstRtp = 0;
+        _audioNextRTCPTs = _nextRTCPIncrement;
 
         _pOutStream = NULL;
@@ -383 +390 @@
 }
 
-bool OutboundConnectivity::CreateRTCPPacket(uint8_t *pDest, uint8_t *pSrc,
+bool OutboundConnectivity::CreateRTCPPacket_mystyle(uint8_t *pDest, uint8_t *pSrc,
                 uint32_t ssrc, uint32_t rate, uint32_t packetsCount, uint32_t bytesCount,
                 bool isAudio) {
@@ -406 +413 @@
         +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
          */
-
-        //      WARN("%s: MUST send SR to %d clients",
-        //                      isAudio ? "Audio" : "Video",
-        //                      _udpVideoRTCPClients.size());
 
         //1. V,P,RC
@@ -481 +484 @@
 }
 
+bool OutboundConnectivity::CreateRTCPPacket_live555style(uint8_t *pDest, uint8_t *pSrc,
+                uint32_t ssrc, uint32_t rate, uint32_t packetsCount, uint32_t bytesCount,
+                bool isAudio) {
+
+        /*
+         0                   1                   2                   3
+         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |V=2|P|    RC   |   PT=SR=200   |             length            | header
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |                         SSRC of sender                        |
+        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+        |              NTP timestamp, most significant word             | sender
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ info
+        |             NTP timestamp, least significant word             |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |                         RTP timestamp                         |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |                     sender's packet count                     |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |                      sender's octet count                     |
+        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+         */
+
+        //1. V,P,RC
+        pDest[0] = 0x80;
+
+        //2. PT
+        pDest[1] = 0xc8;
+
+        //3. Length
+        pDest[2] = 0x00;
+        pDest[3] = 0x06;
+
+        //4. ssrc
+        put_htonl(pDest + 4, ssrc); //SSRC
+
+        //5. NTP
+        struct timeval timeNow;
+        gettimeofday(&timeNow, NULL);
+        put_htonl(pDest + 8, timeNow.tv_sec + 0x83AA7E80);
+        double fractionalPart = (timeNow.tv_usec / 15625.0)*0x04000000; // 2^32/10^6
+        put_htonl(pDest + 12, (uint32_t) fractionalPart);
+
+        //6. RTP
+        uint32_t timestampIncrement = (rate * timeNow.tv_sec);
+        timestampIncrement += (uint32_t) ((2.0 * rate * timeNow.tv_usec + 1000000.0) / 2000000);
+        uint32_t rtpTimestamp = 0 + timestampIncrement;
+        put_htonl(pDest + 16, rtpTimestamp);
+
+        //7. sender's packet count
+        put_htonl(pDest + 20, packetsCount);
+
+        //8. sender's octet count
+        put_htonl(pDest + 24, bytesCount);
+
+        return true;
+}
+
 #endif /* HAS_PROTOCOL_RTP */