Merge pull request #330 from Red5/bug/vod-hd-playback

Fixed play engine
Red5 · Sep 9, 2022 · df5a0c6 · df5a0c6
2 parents 993ffba + 6b1237d
commit df5a0c6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.31</version>
+        <version>1.2.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.31</version>
+        <version>1.2.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>

diff --git a/common/src/main/java/org/red5/server/stream/PlayEngine.java b/common/src/main/java/org/red5/server/stream/PlayEngine.java
@@ -1932,11 +1932,13 @@ public void execute(ISchedulingService svc) {
                                                 if (data != null) {
                                                     data.free();
                                                 }
+                                                //continue to pull and feed.
                                             } else {
+                                            	//ensure p/p executable scheduled and break to exit. 
                                                 pendingMessage = rtmpMessage;
+                                                ensurePullAndPushRunning();
+                                                break;
                                             }
-                                            ensurePullAndPushRunning();
-                                            break;
                                         }
                                     }
                                 } else {

diff --git a/io/pom.xml b/io/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.31</version>
+        <version>1.2.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>1.2.31</version>
+    <version>1.2.32</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>

diff --git a/server/pom.xml b/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.31</version>
+        <version>1.2.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/service/pom.xml b/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.31</version>
+        <version>1.2.32</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>