From 6b1237d6aa185359b05db08df1b7f7f5b74d37a5 Mon Sep 17 00:00:00 2001 From: Andy--S Date: Thu, 8 Sep 2022 14:52:50 -0700 Subject: [PATCH] Fixed play engine for 60fps/48k/subtitles above 100+ packets per second --- client/pom.xml | 2 +- common/pom.xml | 2 +- common/src/main/java/org/red5/server/stream/PlayEngine.java | 6 ++++-- io/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- service/pom.xml | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 41823e9c2..c162a104a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,7 +3,7 @@ org.red5 red5-parent - 1.2.31 + 1.2.32 4.0.0 red5-client diff --git a/common/pom.xml b/common/pom.xml index 7936d78f0..db2ce6784 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ org.red5 red5-parent - 1.2.31 + 1.2.32 4.0.0 red5-server-common diff --git a/common/src/main/java/org/red5/server/stream/PlayEngine.java b/common/src/main/java/org/red5/server/stream/PlayEngine.java index 21998e3ee..6fcc73463 100755 --- 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 index bd36c4f08..9dcbf426d 100644 --- a/io/pom.xml +++ b/io/pom.xml @@ -3,7 +3,7 @@ org.red5 red5-parent - 1.2.31 + 1.2.32 4.0.0 red5-io diff --git a/pom.xml b/pom.xml index 3e751c4b2..4c258bcc6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ Red5 The Red5 server org.red5 - 1.2.31 + 1.2.32 https://github.com/Red5/red5-server 2005 diff --git a/server/pom.xml b/server/pom.xml index 8536d0807..041ff9bbd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -3,7 +3,7 @@ org.red5 red5-parent - 1.2.31 + 1.2.32 4.0.0 red5-server diff --git a/service/pom.xml b/service/pom.xml index 39cf8376f..ab9ececbb 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -3,7 +3,7 @@ org.red5 red5-parent - 1.2.31 + 1.2.32 4.0.0 red5-service