From e060e717f35d2495332e1eceffa75a529bd94749 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Tue, 17 Apr 2012 15:12:45 +0400
Subject: [PATCH] updated tests

---
 test/dump.sh         |  2 +-
 test/ffstream.sh     |  3 +--
 test/nginx.conf      | 10 +---------
 test/play.sh         |  2 +-
 test/www/index.html  | 21 ++-------------------
 test/www/record.html |  4 ++--
 6 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/test/dump.sh b/test/dump.sh
index 3b3db71..d67ac15 100755
--- a/test/dump.sh
+++ b/test/dump.sh
@@ -1 +1 @@
-rtmpdump -v -r "rtmp://localhost/helo/pd"
+rtmpdump -v -r "rtmp://localhost/myapp/mystream"
diff --git a/test/ffstream.sh b/test/ffstream.sh
index ffcd26e..007e950 100755
--- a/test/ffstream.sh
+++ b/test/ffstream.sh
@@ -1,2 +1 @@
-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
+ffmpeg -loglevel verbose -re -i ~/movie.avi  -f flv rtmp://localhost/myapp/mystream
diff --git a/test/nginx.conf b/test/nginx.conf
index 186cf5f..dec66f2 100644
--- a/test/nginx.conf
+++ b/test/nginx.conf
@@ -26,7 +26,7 @@ rtmp {
 
         publish_time_fix off;
 
-        application helo {
+        application myapp {
 
             live on;
 
@@ -34,7 +34,6 @@ rtmp {
             record_path /tmp;
 
             record_max_size 128K;
-#record_max_frames 4;
             record_interval 30s;
 
             record_suffix .this.is.flv;
@@ -42,13 +41,6 @@ rtmp {
             on_publish http://localhost:8080/publish;
             on_play http://localhost:8080/play;
             on_record_done http://localhost:8080/record_done;
-
-            #wait_key_frame on;
-            
-            # publish only from localhost
-            #allow publish 127.0.0.1;
-
-            #deny publish all;
         }
 
     }
diff --git a/test/play.sh b/test/play.sh
index e07cd55..3552679 100755
--- a/test/play.sh
+++ b/test/play.sh
@@ -1 +1 @@
-ffplay -loglevel verbose "rtmp://localhost/helo/pd"
+ffplay -loglevel verbose "rtmp://localhost/myapp/mystream"
diff --git a/test/www/index.html b/test/www/index.html
index 4479448..327fdef 100644
--- a/test/www/index.html
+++ b/test/www/index.html
@@ -10,25 +10,8 @@
                 src: "/jwplayer/player.swf",
                 config: {
                     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://127.0.0.1/helo",
+                    file: "mystream",
+                    streamer: "rtmp://localhost/myapp",
                     provider: "rtmp",
                 }
             }
diff --git a/test/www/record.html b/test/www/record.html
index 89c0fdf..e4c819f 100644
--- a/test/www/record.html
+++ b/test/www/record.html
@@ -4,8 +4,8 @@
 <script type="text/javascript">
 var flashvars =
 {
-    'streamer':                     'rtmp://192.168.0.100/helo',
-    'file':                         'webcam',
+    'streamer':                     'rtmp://10.31.1.78/myapp',
+    'file':                         'mystream',
     'type':                         'camera',
     'controlbar':                   'bottom',
     'stretching':                   'none',