Merge pull request #438 from Red5/bug/RED5DEV-2156

Bug/red5 dev 2156

Author: mondain

.gitignore

@@ -30,3 +30,4 @@ tests/conf/rtmps_truststore.p12
 !SSE-README.md
 !SECURITY_FIXES_SUMMARY.md
 !docs/CACHE_USAGE_EXAMPLES.md
+.codex

client/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.31</version>
+        <version>2.0.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

client/src/main/java/org/red5/client/Red5Client.java

@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 2.0.31";
+    public static final String VERSION = "Red5 Client 2.0.32";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.31</version>
+        <version>2.0.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>

common/src/main/java/org/red5/server/api/Red5.java

@@ -57,12 +57,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 2.0.31";
+    public static final String VERSION = "Red5 Server 2.0.32";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/2,0,31,0";
+    public static final String FMS_VERSION = "RED5/2,0,32,0";
 
     /**
      * Server capabilities

common/src/main/java/org/red5/server/stream/PlayEngine.java

@@ -1199,6 +1199,16 @@ private void sendMessage(RTMPMessage messageIn) {
                         eventTime -= startTs;
                     }
                 }
+                // Clamp negative adjusted timestamps. Buffered events (decoder configs, keyframes)
+                // captured before the live anchor land here with eventTime < 0; place them at ts=1
+                // so they precede the first live frame at ts=2 without being interpreted as a
+                // far-future unsigned-32 value (e.g. -97 on the wire = 0xFFFFFF9F = ~49.7 days).
+                if (eventTime < 0) {
+                    if (isTrace) {
+                        log.trace("sendMessage: clamping negative adjusted timestamp {} to 1 (buffered prelude before live anchor)", eventTime);
+                    }
+                    eventTime = 1;
+                }
                 messageOut.getBody().setTimestamp(eventTime);
                 if (isTrace) {
                     log.trace("sendMessage (updated): streamStartTS={}, length={}, streamOffset={}, timestamp={}", new Object[] { startTs, currentItem.get().getLength(), streamOffset, eventTime });

io/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.31</version>
+        <version>2.0.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

pom.xml

@@ -24,7 +24,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>2.0.31</version>
+    <version>2.0.32</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>

server/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.31</version>
+        <version>2.0.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

service/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.31</version>
+        <version>2.0.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>