Updates for 1.0.10-M8

Author: mondain

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.0.10-M7</version>
+        <version>1.0.10-M8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

src/main/java/org/red5/server/stream/ServerStream.java

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -77,6 +78,8 @@ public class ServerStream extends AbstractStream implements IServerStream, IFilt
 
     private static final long WAIT_THRESHOLD = 0;
 
+    private static EnumSet<StreamState> PLAYING_OR_PAUSED = EnumSet.of(StreamState.PLAYING, StreamState.PAUSED);
+
     /**
      * Stream published name
      */
@@ -424,7 +427,7 @@ public void setPublishedName(String name) {
      * Start this server-side stream
      */
     public void start() {
-        if (state != StreamState.UNINIT) {
+        if (state.get() != StreamState.UNINIT) {
             throw new IllegalStateException("State " + state + " not valid to start");
         }
         if (items.size() == 0) {
@@ -452,7 +455,7 @@ public void start() {
      * Stop this server-side stream
      */
     public void stop() {
-        if (state == StreamState.PLAYING || state == StreamState.PAUSED) {
+        if (PLAYING_OR_PAUSED.contains(state.get())) {
             if (liveJobName != null) {
                 scheduler.removeScheduledJob(liveJobName);
                 liveJobName = null;
@@ -493,7 +496,7 @@ public void stopRecording() {
     /** {@inheritDoc} */
     @SuppressWarnings("incomplete-switch")
     public void pause() {
-        switch (state) {
+        switch (state.get()) {
             case PLAYING:
                 setState(StreamState.PAUSED);
                 break;
@@ -508,14 +511,14 @@ public void pause() {
     /** {@inheritDoc} */
     public void seek(int position) {
         // seek only allowed when playing or paused
-        if (state == StreamState.PLAYING || state == StreamState.PAUSED) {
+        if (PLAYING_OR_PAUSED.contains(state.get())) {
             sendVODSeekCM(msgIn, position);
         }
     }
 
     /** {@inheritDoc} */
     public void close() {
-        if (state == StreamState.PLAYING || state == StreamState.PAUSED) {
+        if (PLAYING_OR_PAUSED.contains(state.get())) {
             stop();
         }
         if (msgOut != null) {
@@ -567,7 +570,7 @@ public void onPipeConnectionEvent(PipeConnectionEvent event) {
      */
     protected void play(IPlayItem item) {
         // dont play unless we are stopped
-        if (state == StreamState.STOPPED) {
+        if (state.get() == StreamState.STOPPED) {
             // assume this is not live stream
             boolean isLive = false;
             if (providerService != null) {
@@ -738,7 +741,7 @@ protected void scheduleNextMessage() {
                     delta = nextTS - vodStartTS - (System.currentTimeMillis() - serverStartTS);
                     if (delta < WAIT_THRESHOLD) {
                         if (doPushMessage()) {
-                            if (state != StreamState.PLAYING) {
+                            if (state.get() != StreamState.PLAYING) {
                                 // Stream is not playing, don't load more messages
                                 nextRTMPMessage = null;
                             }
@@ -757,7 +760,7 @@ public void execute(ISchedulingService service) {
                 if (vodJobName != null) {
                     vodJobName = null;
                     if (doPushMessage()) {
-                        if (state == StreamState.PLAYING) {
+                        if (state.get() == StreamState.PLAYING) {
                             scheduleNextMessage();
                         } else {
                             // Stream is paused, don't load more messages

src/main/server/red5.bat

@@ -8,7 +8,7 @@ if NOT DEFINED JAVA_HOME goto err
 
 REM JAVA options
 REM You can set JVM additional options here if you want
-if NOT DEFINED JVM_OPTS set JVM_OPTS=-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m  -XX:+DisableExplicitGC -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2
+if NOT DEFINED JVM_OPTS set JVM_OPTS=-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2
 REM Set up logging options
 set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true
 REM Set up security options

src/main/server/red5.sh

@@ -37,7 +37,7 @@ echo "Running on " $OS
 # JAVA options
 # You can set JVM additional options here if you want
 if [ -z "$JVM_OPTS" ]; then 
-    JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m  -XX:+DisableExplicitGC -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2"
+    JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2"
 fi
 # Set up security options
 SECURITY_OPTS="-Djava.security.debug=failure"