Changeset 232

Timestamp:

01/01/11 15:55:42 (17 months ago)

Author:

shiretu

Message:

-- fixed RTSP timestamp roll-over
-- added a timestamp on each log message and also flush on each line for file log appender

Location:

trunk/sources

Files:

• common/src/utils/logging/fileloglocation.cpp (modified) (1 diff)
• thelib/include/protocols/rtp/inboundrtpprotocol.h (modified) (1 diff)
• thelib/src/protocols/rtp/inboundrtpprotocol.cpp (modified) (3 diffs)
• thelib/src/protocols/rtp/streaming/innetrtpstream.cpp (modified) (2 diffs)

trunk/sources/common/src/utils/logging/fileloglocation.cpp

@@ -46 +46 @@
                 return;
         }
-        string logEntry = format("%d:%s:%d:%s:%s\n",
-                        level, STR(fileName), lineNumber, STR(functionName), STR(message));
+        string logEntry = format("%d:%d:%s:%d:%s:%s\n",
+                        time(NULL), level, STR(fileName), lineNumber, STR(functionName),
+                        STR(message));
         _fileStream.write(STR(logEntry), logEntry.size());
-        if ((_counter++) % 1000 == 0) {
-                _fileStream.flush();
-        }
+        _fileStream.flush();
 }
 

trunk/sources/thelib/include/protocols/rtp/inboundrtpprotocol.h

@@ -38 +38 @@
         uint16_t _seqRollOver;
         uint64_t _lastTimestamp;
-        uint32_t _timestampRollover;
+        uint64_t _timestampRollover;
         bool _isAudio;
         uint32_t _packetsCount;
-        uint32_t _delta;
 public:
         InboundRTPProtocol();

trunk/sources/thelib/src/protocols/rtp/inboundrtpprotocol.cpp

@@ -37 +37 @@
         _isAudio = false;
         _packetsCount = 0;
-        _delta = 0;
 }
 
@@ -122 +121 @@
         length -= 12 + GET_RTP_CC(_rtpHeader)*4;
 
-        //5. Normalize the timestamp to 0
-        if (_delta == 0) {
-                _delta = _rtpHeader._timestamp;
-        }
-        _rtpHeader._timestamp -= _delta;
-
-
-        //      if (GetId() == 10) {
-        //              _rtpHeader._timestamp = (uint32_t) _rtpHeader._timestamp + 0xffdd0000;
-        //              //FINEST("%d: _rtpHeader._timestamp: %08x", GetId(), _rtpHeader._timestamp);
-        //      }
-        //      if (GetId() == 12) {
-        //              _rtpHeader._timestamp = (uint32_t) _rtpHeader._timestamp + 0xfff00000;
-                //              //FINEST("%d: _rtpHeader._timestamp: %08x", GetId(), _rtpHeader._timestamp);
-        //      }
-
         //6. Detect rollover and adjust the timestamp
         if (_rtpHeader._timestamp < _lastTimestamp) {
+                FINEST("Possible roll over: _rtpHeader._timestamp: %016llx; _lastTimestamp: %016llx",
+                                _rtpHeader._timestamp, _lastTimestamp);
                 if ((((_rtpHeader._timestamp & 0x80000000) >> 31) == 0)
                                 && (((_lastTimestamp & 0x80000000) >> 31) == 1)) {
                         _timestampRollover++;
                         _lastTimestamp = _rtpHeader._timestamp;
-                        WARN("Roll over on %d", GetId());
+                        WARN("Roll over on %d; _timestampRollover: %d", GetId(), _timestampRollover);
                 } else {
                         WARN("Bogus timestamp. current ts: %016llx; last ts: %016llx",
@@ -154 +139 @@
                 _lastTimestamp = _rtpHeader._timestamp;
         }
-        _rtpHeader._timestamp = _timestampRollover * 0xffffffff + _rtpHeader._timestamp;
+        //      string msg = "";
+        //      if ((_lastSeq % 1000) == 0) {
+        //              msg = format("%d: %016llx", GetId(), _rtpHeader._timestamp);
+        //      }
+        _rtpHeader._timestamp = (_timestampRollover << 32) | _rtpHeader._timestamp;
+        //      if ((_lastSeq % 1000) == 0) {
+        //              msg += format("(%016llx)", _rtpHeader._timestamp);
+        //              FINEST(STR(msg));
+        //      }
 
         //5. Feed the data to the stream

trunk/sources/thelib/src/protocols/rtp/streaming/innetrtpstream.cpp

@@ -152 +152 @@
         double &lastTs = isAudio ? _lastAudioTs : _lastVideoTs;
 
-        if ((uint64_t) (lastTs * 100.00) == (uint64_t) (absoluteTimestamp * 100.00)) {
+        if ((-1.0 < (lastTs * 100.00 - absoluteTimestamp * 100.00))
+                        && ((lastTs * 100.00 - absoluteTimestamp * 100.00) < 1.00)) {
                 absoluteTimestamp = lastTs;
         }
 
-        if ((uint64_t) (lastTs * 100.00) > (uint64_t) (absoluteTimestamp * 100.00)) {
-                WARN("Back time on %s. ATS: %.08f LTS: %.08f; D: %.8f",
+        if (lastTs * 100.00 > absoluteTimestamp * 100.00) {
+                WARN("Back time on %s. ATS: %.08f LTS: %.08f; D: %.8f; isAudio: %d",
                                 STR(GetName()),
                                 absoluteTimestamp,
                                 lastTs,
-                                absoluteTimestamp - lastTs);
+                                absoluteTimestamp - lastTs,
+                                isAudio);
                 return true;
         }
@@ -214 +216 @@
 
         //2. get the nalu
-        double ts = (double) rtpHeader._timestamp / _capabilities.avc._rate * 1000.0;
+        double ts = (double) rtpHeader._timestamp / (double) _capabilities.avc._rate * 1000.0;
         uint8_t naluType = NALU_TYPE(pData[0]);
         if (naluType <= 23) {