From fa6d9fc84f29032b26ebc1e5713cdbbed1a27344 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Sat, 24 Mar 2012 10:26:07 +0400
Subject: [PATCH] README

---
 README               | 25 +++++++++++++++++++++----
 TODO                 |  2 ++
 test/ffstream.sh     |  2 +-
 test/nginx.conf      |  8 ++++----
 test/www/index.html  | 23 ++++++++++++++++++++---
 test/www/record.html |  4 ++--
 6 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/README b/README
index c4f9fb9..643942b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-==nginx-rtmp-module==
+== nginx-rtmp-module ==
 
 NGINX-based RTMP server
 
@@ -25,7 +25,7 @@ make
 make install
 
 
-RMTP URL format:
+RTMP URL format:
 
 rtmp://rtmp.example.com/<app>[/<name>]
 
@@ -47,8 +47,6 @@ rtmp {
 
         max_buf 1000000;
 
-        #timestamp_fix off;
-
         # TV mode: one publisher, many subscribers
         application mytv {
 
@@ -81,3 +79,22 @@ rtmp {
     }
 }
 
+
+Compatibility:
+
+Two time fix options exist in server{} block:
+
+play_time_fix on|off;
+publish_time_fix on|off;
+
+Both are on by default.
+
+These time fixes need to be turned off
+when playing with non-Adobe software 
+(like ffmpeg) or publishing longer
+streams (>4 hours) with such software.
+
+Streams generated/expected by Adobe software
+do not satisfy the spec (written by them!).
+Third-party software does.
+
diff --git a/TODO b/TODO
index c8fbba5..2559062 100644
--- a/TODO
+++ b/TODO
@@ -11,3 +11,5 @@
 
 - fix '..greeing line..' in log
 
+- play only streams being published
+
diff --git a/test/ffstream.sh b/test/ffstream.sh
index 60c41c3..ffcd26e 100755
--- a/test/ffstream.sh
+++ b/test/ffstream.sh
@@ -1,2 +1,2 @@
-ffmpeg -loglevel verbose -re -i /mnt/home/rarutyunyan/Videos/anything_else-solaris.giga.su.avi  -f flv rtmp://localhost/helo
+ffmpeg -loglevel verbose -re -i /mnt/home/rarutyunyan/Videos/anything_else-solaris.giga.su.avi  -f flv rtmp://localhost/helo/movie
 #ffmpeg -loglevel verbose -re -i /mnt/home/rarutyunyan/Videos/the_changeup-solaris.giga.su.avi -an -f flv rtmp://localhost/helo
diff --git a/test/nginx.conf b/test/nginx.conf
index d576981..a641d1e 100644
--- a/test/nginx.conf
+++ b/test/nginx.conf
@@ -24,7 +24,7 @@ rtmp {
 
         max_buf 1000000;
 
-        #timestamp_fix off;
+        publish_time_fix off;
 
         application helo {
 
@@ -32,14 +32,14 @@ rtmp {
 
             record /tmp/av;
 
-            record_size 3000000;
+            record_size 10000000;
 
             #wait_key_frame on;
             
             # publish only from localhost
-            allow publish 127.0.0.1;
+            #allow publish 127.0.0.1;
 
-            deny publish all;
+            #deny publish all;
         }
 
     }
diff --git a/test/www/index.html b/test/www/index.html
index cb234ad..293c82a 100644
--- a/test/www/index.html
+++ b/test/www/index.html
@@ -9,9 +9,26 @@
             {   type: "flash",
                 src: "/jwplayer/player.swf",
                 config: {
-                    bufferlength: 3,
-                    file: "online",
-                    streamer: "rtmp://10.31.1.78/helo",
+                    bufferlength: 1,
+                    file: "webcam",
+                    streamer: "rtmp://192.168.0.100/helo",
+                    provider: "rtmp",
+                }
+            }
+        ]
+});
+</script>
+
+<div id="container2">Loading the player ...</div>
+    <script type="text/javascript">
+        jwplayer("container2").setup({
+        modes: [
+            {   type: "flash",
+                src: "/jwplayer/player.swf",
+                config: {
+                    bufferlength: 1,
+                    file: "movie",
+                    streamer: "rtmp://192.168.0.100/helo",
                     provider: "rtmp",
                 }
             }
diff --git a/test/www/record.html b/test/www/record.html
index a071560..89c0fdf 100644
--- a/test/www/record.html
+++ b/test/www/record.html
@@ -4,8 +4,8 @@
 <script type="text/javascript">
 var flashvars =
 {
-    'streamer':                     'rtmp://10.31.1.78/helo',
-    'file':                         'livestream',
+    'streamer':                     'rtmp://192.168.0.100/helo',
+    'file':                         'webcam',
     'type':                         'camera',
     'controlbar':                   'bottom',
     'stretching':                   'none',