flazr-svn — Flazr Subversion Commits

[<fl...@us...>]

Revision: 85
          http://flazr.svn.sourceforge.net/flazr/?rev=85&view=rev
Author:   florian
Date:     2010-08-17 11:08:21 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
fixes for LIVE streams
RtmpEncoder:
- force large header if first packet
ServerHandler:
- do not mark a stream as "recorded" if it is live
- use current play name in stream start message

Modified Paths:
--------------
    trunk/flazr/src/main/java/com/flazr/rtmp/RtmpEncoder.java
    trunk/flazr/src/main/java/com/flazr/rtmp/server/ServerStream.java

Modified: trunk/flazr/src/main/java/com/flazr/rtmp/RtmpEncoder.java
===================================================================
--- trunk/flazr/src/main/java/com/flazr/rtmp/RtmpEncoder.java	2010-04-22 07:13:22 UTC (rev 84)
+++ trunk/flazr/src/main/java/com/flazr/rtmp/RtmpEncoder.java	2010-08-17 11:08:21 UTC (rev 85)
@@ -80,7 +80,10 @@
             } else {
                 header.setDeltaTime(deltaTime);
             }
-        } // else will be default LARGE
+        } else {
+			// otherwise force to LARGE
+            header.setHeaderType(RtmpHeader.Type.LARGE);
+        }
         channelPrevHeaders[channelId] = header;        
         if(logger.isDebugEnabled()) {
             logger.debug(">> {}", message);

Modified: trunk/flazr/src/main/java/com/flazr/rtmp/server/ServerStream.java
===================================================================
--- trunk/flazr/src/main/java/com/flazr/rtmp/server/ServerStream.java	2010-04-22 07:13:22 UTC (rev 84)
+++ trunk/flazr/src/main/java/com/flazr/rtmp/server/ServerStream.java	2010-08-17 11:08:21 UTC (rev 85)
@@ -25,6 +25,8 @@
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.group.ChannelGroup;
 import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ServerStream {
 
@@ -50,6 +52,8 @@
     private final List<RtmpMessage> configMessages;
     private Channel publisher;
 
+    private static final Logger logger = LoggerFactory.getLogger(ServerStream.class);
+
     public ServerStream(final String rawName, final String typeString) {        
         this.name = Utils.trimSlashes(rawName).toLowerCase();
         if(typeString != null) {
@@ -60,7 +64,8 @@
             this.publishType = null;
             subscribers = null;
             configMessages = null;
-        }        
+        }
+        logger.info("Created ServerStream {}", this);
     }
 
     public boolean isLive() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.