RTMP: Use extended timestamp as delta when chunk fmt=1/2. v6.0.167 v7.0.37

trunk/doc/CHANGELOG.md

@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v7-changes"></a>
 
 ## SRS 7.0 Changelog
+* v7.0, 2025-05-29, Merge [#4356](https://github.com/ossrs/srs/pull/4356): RTMP: Use extended timestamp as delta when chunk fmt=1/2. v7.0.37 (#4356)
 * v7.0, 2025-05-29, Merge [#4363](https://github.com/ossrs/srs/pull/4363): Fix error about TestRtcPublish_HttpFlvPlay. v7.0.36 (#4363)
 * v7.0, 2025-05-29, Merge [#4362](https://github.com/ossrs/srs/pull/4362): Update VSCode launch configuration to support GDB on Linux and LLDB on macOS. v7.0.35 (#4362)
 * v7.0, 2025-05-26, Merge [#4359](https://github.com/ossrs/srs/pull/4359): update pion/webrtc to v4. v7.0.34 (#4359)
@@ -47,6 +48,7 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2025-05-29, Merge [#4356](https://github.com/ossrs/srs/pull/4356): RTMP: Use extended timestamp as delta when chunk fmt=1/2. v6.0.167 (#4356)
 * v6.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v6.0.165 (#4303)
 * v6.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v6.0.164 (#4305)
 * v6.0, 2025-03-18, Merge [#4302](https://github.com/ossrs/srs/pull/4302): update geekyeggo/delete-artifact to 5.0.0. v6.0.163 (#4302)

trunk/src/core/srs_core_version6.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    166
+#define VERSION_REVISION    167
 
 #endif

trunk/src/protocol/srs_protocol_rtmp_stack.cpp

@@ -1032,8 +1032,8 @@ srs_error_t SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
         // 0x00ffffff), this value MUST be 16777215, and the 'extended
         // timestamp header' MUST be present. Otherwise, this value SHOULD be
         // the entire delta.
-        chunk->extended_timestamp = (chunk->header.timestamp_delta >= RTMP_EXTENDED_TIMESTAMP);
-        if (!chunk->extended_timestamp) {
+        chunk->has_extended_timestamp = (chunk->header.timestamp_delta >= RTMP_EXTENDED_TIMESTAMP);
+        if (!chunk->has_extended_timestamp) {
             // Extended timestamp: 0 or 4 bytes
             // This field MUST be sent when the normal timsestamp is set to
             // 0xffffff, it MUST NOT be sent if the normal timestamp is set to
@@ -1085,13 +1085,13 @@ srs_error_t SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
         }
     } else {
         // update the timestamp even fmt=3 for first chunk packet
-        if (is_first_chunk_of_msg && !chunk->extended_timestamp) {
+        if (is_first_chunk_of_msg && !chunk->has_extended_timestamp) {
             chunk->header.timestamp += chunk->header.timestamp_delta;
         }
     }
 
     // read extended-timestamp
-    if (chunk->extended_timestamp) {
+    if (chunk->has_extended_timestamp) {
         mh_size += 4;
         if ((err = in_buffer->grow(skt, 4)) != srs_success) {
             return srs_error_wrap(err, "read 4 bytes ext timestamp");
@@ -1127,7 +1127,7 @@ srs_error_t SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
          * @remark, srs always send the extended-timestamp, to keep simple,
          * and compatible with adobe products.
          */
-        uint32_t chunk_timestamp = (uint32_t)chunk->header.timestamp;
+        uint32_t chunk_extended_timestamp = (uint32_t)chunk->extended_timestamp;
 
         /**
          * if chunk_timestamp<=0, the chunk previous packet has no extended-timestamp,
@@ -1137,11 +1137,16 @@ srs_error_t SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt)
          * about the is_first_chunk_of_msg.
          * @remark, for the first chunk of message, always use the extended timestamp.
          */
-        if (!is_first_chunk_of_msg && chunk_timestamp > 0 && chunk_timestamp != timestamp) {
+        if (!is_first_chunk_of_msg && chunk_extended_timestamp > 0 && chunk_extended_timestamp != timestamp) {
             mh_size -= 4;
             in_buffer->skip(-4);
         } else {
-            chunk->header.timestamp = timestamp;
+            chunk->extended_timestamp = timestamp;
+            if (fmt == RTMP_FMT_TYPE0) {
+                chunk->header.timestamp = timestamp;
+            } else if (is_first_chunk_of_msg) {
+                chunk->header.timestamp += timestamp;
+            }
         }
     }
 
@@ -1439,9 +1444,10 @@ SrsChunkStream::SrsChunkStream(int _cid)
 {
     fmt = 0;
     cid = _cid;
-    extended_timestamp = false;
+    has_extended_timestamp = false;
     msg = NULL;
     msg_count = 0;
+    extended_timestamp = 0;
 }
 
 SrsChunkStream::~SrsChunkStream()

trunk/src/protocol/srs_protocol_rtmp_stack.hpp

@@ -380,11 +380,16 @@ class SrsChunkStream
     // Cached message header
     SrsMessageHeader header;
     // Whether the chunk message header has extended timestamp.
-    bool extended_timestamp;
+    bool has_extended_timestamp;
     // The partially read message.
     SrsCommonMessage* msg;
     // Decoded msg count, to identify whether the chunk stream is fresh.
     int64_t msg_count;
+    // Because the extended timestamp may be a delta timestamp, it can differ
+    // from the timestamp in the header, so it should be stored as a distinct field
+    // for comparison with the extended timestamp of subsequent chunks.
+    // See https://github.com/ossrs/srs/pull/4356 for details.
+    int32_t extended_timestamp;
 public:
     SrsChunkStream(int _cid);
     virtual ~SrsChunkStream();