From ac1a2f911681fdb0703c424d44b177f1b65b1f2a Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 24 Dec 2013 11:00:07 +0800
Subject: [PATCH 01/30] add tencent QQ group link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 454290ade..e385e9853 100755
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ srs supports vhost, rtmp, HLS, transcoding, forward, http hooks. <br/>
 blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>
 see also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) <br/>
 see also: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server)
-TencentQQ: http://url.cn/WAHICw (Group: 212189142)
+TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142)
 
 ### Contributors
 winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>

From bc2125faa955236cdf902e32f49b70d9d0f609a7 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 24 Dec 2013 11:01:11 +0800
Subject: [PATCH 02/30] add tencent QQ group link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e385e9853..c7022e0d7 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ srs is a simple, high-performance, running in single process, origin live server
 srs supports vhost, rtmp, HLS, transcoding, forward, http hooks. <br/>
 blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) <br/>
 see also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) <br/>
-see also: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server)
+see also: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server) <br/>
 TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142)
 
 ### Contributors

From cb0c7dcf2e55c65a77ff597d95c688df1cad199f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 12:48:17 +0800
Subject: [PATCH 03/30] fix the bitrate bug(in Bps), use enhanced microphone.

---
 README.md                                     |   1 +
 trunk/research/players/index.html             |   1 +
 trunk/research/players/js/srs.js              | 186 +++++++++---------
 trunk/research/players/js/srs.log.js          |  24 +++
 trunk/research/players/jwplayer6.html         |   1 +
 trunk/research/players/osmf.html              |   1 +
 trunk/research/players/srs_bwt.html           |   1 +
 trunk/research/players/srs_chat.html          |   3 +-
 trunk/research/players/srs_player.html        |   1 +
 .../players/srs_player/release/srs_player.swf | Bin 5274 -> 5333 bytes
 .../players/srs_player/src/srs_player.as      |   7 +-
 trunk/research/players/srs_publisher.html     |   1 +
 .../srs_publisher/release/srs_publisher.swf   | Bin 4524 -> 4608 bytes
 .../srs_publisher/src/srs_publisher.as        |  37 ++--
 trunk/research/players/vlc.html               |   1 +
 15 files changed, 152 insertions(+), 113 deletions(-)
 create mode 100755 trunk/research/players/js/srs.log.js

diff --git a/README.md b/README.md
index c7022e0d7..68690bd5e 100755
--- a/README.md
+++ b/README.md
@@ -276,6 +276,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 * nginx v1.5.0: 139524 lines <br/>
 
 ### History
+* v0.9, 2013-12-25, fix the bitrate bug(in Bps), use enhanced microphone.
 * v0.9, 2013-12-22, demo video meeting or chat(srs+cherrypy+jquery+bootstrap).
 * v0.9, 2013-12-22, merge from wenjie, support banwidth test.
 * v0.9, 2013-12-22, merge from wenjie: support set chunk size at vhost level
diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index cbffc8852..f017d418a 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/js/srs.js b/trunk/research/players/js/srs.js
index b5f105f32..0a9a28d47 100755
--- a/trunk/research/players/js/srs.js
+++ b/trunk/research/players/js/srs.js
@@ -52,31 +52,6 @@ function update_nav() {
     $("#nav_vlc").attr("href", "vlc.html" + window.location.search);
 }
 
-/**
-* log specified, there must be a log element as:
-    <!-- for the log -->
-    <div class="alert alert-info fade in" id="txt_log">
-        <button type="button" class="close" data-dismiss="alert">×</button>
-        <strong><span id="txt_log_title">Usage:</span></strong>
-        <span id="txt_log_msg">创建会议室，或者加入会议室</span>
-    </div>
-*/
-function info(desc) {
-    $("#txt_log").addClass("alert-info").removeClass("alert-error").removeClass("alert-warn");
-    $("#txt_log_title").text("Info:");
-    $("#txt_log_msg").text(desc);
-}
-function warn(code, desc) {
-    $("#txt_log").removeClass("alert-info").removeClass("alert-error").addClass("alert-warn");
-    $("#txt_log_title").text("Warn:");
-    $("#txt_log_msg").text("code: " + code + ", " + desc);
-}
-function error(code, desc) {
-    $("#txt_log").removeClass("alert-info").addClass("alert-error").removeClass("alert-warn");
-    $("#txt_log_title").text("Error:");
-    $("#txt_log_msg").text("code: " + code + ", " + desc);
-}
-
 /**
 * parse the query string to object.
 */
@@ -247,10 +222,8 @@ function srs_init_publish(rtmp_url) {
     }
 }
 
-/**
-* when publisher ready, init the page elements.
-*/
-function srs_publisher_initialize_page(
+// without default values set.
+function srs_initialize_codec_page(
     cameras, microphones,
     sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
 ) {
@@ -265,14 +238,36 @@ function srs_publisher_initialize_page(
             break;
         }
     }
+    // optional: select the first "integrated" signed.
+    for (var i = 0; i < cameras.length; i++) {
+        if (cameras[i].toLowerCase().indexOf("integrated") >= 0) {
+            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+            break;
+        }
+    }
     
     $(sl_microphones).empty();
     for (var i = 0; i < microphones.length; i++) {
         $(sl_microphones).append("<option value='" + i + "'>" + microphones[i] + "</option");
     }
+    // optional: select the first no "default" signed.
+    for (var i = 0; i < microphones.length; i++) {
+        if (microphones[i].toLowerCase().indexOf("default") == -1) {
+            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+            break;
+        }
+    }
+    // optional: select the first "realtek" signed.
+    for (var i = 0; i < microphones.length; i++) {
+        if (microphones[i].toLowerCase().indexOf("realtek") >= 0) {
+            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+            break;
+        }
+    }
     
     $(sl_vcodec).empty();
     var vcodecs = ["h264", "vp6"];
+    vcodecs = ["h264"]; // h264 only.
     for (var i = 0; i < vcodecs.length; i++) {
         $(sl_vcodec).append("<option value='" + vcodecs[i] + "'>" + vcodecs[i] + "</option");
     }
@@ -282,7 +277,6 @@ function srs_publisher_initialize_page(
     for (var i = 0; i < profiles.length; i++) {
         $(sl_profile).append("<option value='" + profiles[i] + "'>" + profiles[i] + "</option");
     }
-    $(sl_profile + " option[value='main']").attr("selected", true);
     
     $(sl_level).empty();
     var levels = ["1", "1b", "1.1", "1.2", "1.3", 
@@ -290,7 +284,6 @@ function srs_publisher_initialize_page(
     for (var i = 0; i < levels.length; i++) {
         $(sl_level).append("<option value='" + levels[i] + "'>" + levels[i] + "</option");
     }
-    $(sl_level + " option[value='4.1']").attr("selected", true);
     
     $(sl_gop).empty();
     var gops = ["0.3", "0.5", "1", "2", "3", "4", 
@@ -298,7 +291,6 @@ function srs_publisher_initialize_page(
     for (var i = 0; i < gops.length; i++) {
         $(sl_gop).append("<option value='" + gops[i] + "'>" + gops[i] + "秒</option");
     }
-    $(sl_gop + " option[value='10']").attr("selected", true);
     
     $(sl_size).empty();
     var sizes = ["176x144", "320x240", "352x240", 
@@ -307,14 +299,12 @@ function srs_publisher_initialize_page(
     for (i = 0; i < sizes.length; i++) {
         $(sl_size).append("<option value='" + sizes[i] + "'>" + sizes[i] + "</option");
     }
-    $(sl_size + " option[value='640x480']").attr("selected", true);
     
     $(sl_fps).empty();
     var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
     for (i = 0; i < fpses.length; i++) {
         $(sl_fps).append("<option value='" + fpses[i] + "'>" + Number(fpses[i]).toFixed(2) + " 帧/秒</option");
     }
-    $(sl_fps + " option[value='20']").attr("selected", true);
     
     $(sl_bitrate).empty();
     var bitrates = ["50", "200", "350", "500", "650", "800", 
@@ -322,6 +312,40 @@ function srs_publisher_initialize_page(
     for (i = 0; i < bitrates.length; i++) {
         $(sl_bitrate).append("<option value='" + bitrates[i] + "'>" + bitrates[i] + " kbps</option");
     }
+}
+/**
+* when publisher ready, init the page elements.
+*/
+function srs_publisher_initialize_page(
+    cameras, microphones,
+    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+) {
+    srs_initialize_codec_page(
+        cameras, microphones,
+        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    );
+    
+    //var profiles = ["baseline", "main"];
+    $(sl_profile + " option[value='main']").attr("selected", true);
+    
+    //var levels = ["1", "1b", "1.1", "1.2", "1.3", 
+    //    "2", "2.1", "2.2", "3", "3.1", "3.2", "4", "4.1", "4.2", "5", "5.1"];
+    $(sl_level + " option[value='4.1']").attr("selected", true);
+    
+    //var gops = ["0.3", "0.5", "1", "2", "3", "4", 
+    //    "5", "6", "7", "8", "9", "10", "15", "20"];
+    $(sl_gop + " option[value='10']").attr("selected", true);
+    
+    //var sizes = ["176x144", "320x240", "352x240", 
+    //    "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
+    //    "1024x768", "1280x720", "1360x768", "1920x1080"];
+    $(sl_size + " option[value='640x480']").attr("selected", true);
+    
+    //var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
+    $(sl_fps + " option[value='20']").attr("selected", true);
+    
+    //var bitrates = ["50", "200", "350", "500", "650", "800", 
+    //    "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
     $(sl_bitrate + " option[value='500']").attr("selected", true);
 }
 /**
@@ -331,75 +355,33 @@ function srs_chat_initialize_page(
     cameras, microphones,
     sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
 ) {
-    $(sl_cameras).empty();
-    for (var i = 0; i < cameras.length; i++) {
-        $(sl_cameras).append("<option value='" + i + "'>" + cameras[i] + "</option");
-    }
-    // optional: select the first no "virtual" signed.
-    for (var i = 0; i < cameras.length; i++) {
-        if (cameras[i].toLowerCase().indexOf("virtual") == -1) {
-            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
-            break;
-        }
-    }
+    srs_initialize_codec_page(
+        cameras, microphones,
+        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    );
     
-    $(sl_microphones).empty();
-    for (var i = 0; i < microphones.length; i++) {
-        $(sl_microphones).append("<option value='" + i + "'>" + microphones[i] + "</option");
-    }
-    
-    $(sl_vcodec).empty();
-    var vcodecs = ["h264", "vp6"];
-    for (var i = 0; i < vcodecs.length; i++) {
-        $(sl_vcodec).append("<option value='" + vcodecs[i] + "'>" + vcodecs[i] + "</option");
-    }
-    
-    $(sl_profile).empty();
-    var profiles = ["baseline", "main"];
-    for (var i = 0; i < profiles.length; i++) {
-        $(sl_profile).append("<option value='" + profiles[i] + "'>" + profiles[i] + "</option");
-    }
+    //var profiles = ["baseline", "main"];
     $(sl_profile + " option[value='baseline']").attr("selected", true);
     
-    $(sl_level).empty();
-    var levels = ["1", "1b", "1.1", "1.2", "1.3", 
-        "2", "2.1", "2.2", "3", "3.1", "3.2", "4", "4.1", "4.2", "5", "5.1"];
-    for (var i = 0; i < levels.length; i++) {
-        $(sl_level).append("<option value='" + levels[i] + "'>" + levels[i] + "</option");
-    }
-    $(sl_level + " option[value='3.1']").attr("selected", true);
+    //var levels = ["1", "1b", "1.1", "1.2", "1.3", 
+    //    "2", "2.1", "2.2", "3", "3.1", "3.2", "4", "4.1", "4.2", "5", "5.1"];
+    $(sl_level + " option[value='2.1']").attr("selected", true);
     
-    $(sl_gop).empty();
-    var gops = ["0.3", "0.5", "1", "2", "3", "4", 
-        "5", "6", "7", "8", "9", "10", "15", "20"];
-    for (var i = 0; i < gops.length; i++) {
-        $(sl_gop).append("<option value='" + gops[i] + "'>" + gops[i] + "秒</option");
-    }
+    //var gops = ["0.3", "0.5", "1", "2", "3", "4", 
+    //    "5", "6", "7", "8", "9", "10", "15", "20"];
     $(sl_gop + " option[value='0.5']").attr("selected", true);
     
-    $(sl_size).empty();
-    var sizes = ["176x144", "320x240", "352x240", 
-        "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
-        "1024x768", "1280x720", "1360x768", "1920x1080"];
-    for (i = 0; i < sizes.length; i++) {
-        $(sl_size).append("<option value='" + sizes[i] + "'>" + sizes[i] + "</option");
-    }
-    $(sl_size + " option[value='460x240']").attr("selected", true);
+    //var sizes = ["176x144", "320x240", "352x240", 
+    //    "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
+    //    "1024x768", "1280x720", "1360x768", "1920x1080"];
+    $(sl_size + " option[value='320x240']").attr("selected", true);
     
-    $(sl_fps).empty();
-    var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
-    for (i = 0; i < fpses.length; i++) {
-        $(sl_fps).append("<option value='" + fpses[i] + "'>" + Number(fpses[i]).toFixed(2) + " 帧/秒</option");
-    }
-    $(sl_fps + " option[value='15']").attr("selected", true);
+    //var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
+    $(sl_fps + " option[value='10']").attr("selected", true);
     
-    $(sl_bitrate).empty();
-    var bitrates = ["50", "200", "350", "500", "650", "800", 
-        "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
-    for (i = 0; i < bitrates.length; i++) {
-        $(sl_bitrate).append("<option value='" + bitrates[i] + "'>" + bitrates[i] + " kbps</option");
-    }
-    $(sl_bitrate + " option[value='350']").attr("selected", true);
+    //var bitrates = ["50", "200", "350", "500", "650", "800", 
+    //    "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
+    $(sl_bitrate + " option[value='200']").attr("selected", true);
 }
 /**
 * get the vcodec and acodec.
@@ -451,6 +433,7 @@ function SrsPlayer(container, width, height, private_object) {
     this.id = SrsPlayer.__id++;
     this.stream_url = null;
     this.buffer_time = 0.8; // default to 0.8
+    this.volume = 1.0; // default to 100%
     this.callbackObj = null;
     
     // callback set the following values.
@@ -502,12 +485,19 @@ SrsPlayer.prototype.start = function(url) {
 /**
 * play the stream.
 * @param stream_url the url of stream, rtmp or http.
+* @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%.
 */
-SrsPlayer.prototype.play = function(url) {
+SrsPlayer.prototype.play = function(url, volume) {
     if (url) {
         this.stream_url = url;
     }
-    this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time);
+    
+    // volume maybe 0, so never use if(volume) to check its value.
+    if (volume != null && volume != undefined) {
+        this.volume = volume;
+    }
+    
+    this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time, this.volume);
 }
 SrsPlayer.prototype.stop = function() {
     for (var i = 0; i < SrsPlayer.__players.length; i++) {
@@ -652,7 +642,7 @@ function SrsPublisher(container, width, height, private_object) {
     this.errors = {
         "100": "无法获取指定的摄像头", //error_camera_get 
         "101": "无法获取指定的麦克风", //error_microphone_get 
-        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头", //error_camera_muted 
+        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头" //error_camera_muted 
     };
 }
 /**
diff --git a/trunk/research/players/js/srs.log.js b/trunk/research/players/js/srs.log.js
new file mode 100755
index 000000000..c3ffde5f5
--- /dev/null
+++ b/trunk/research/players/js/srs.log.js
@@ -0,0 +1,24 @@
+/**
+* log specified, there must be a log element as:
+    <!-- for the log -->
+    <div class="alert alert-info fade in" id="txt_log">
+        <button type="button" class="close" data-dismiss="alert">×</button>
+        <strong><span id="txt_log_title">标题:</span></strong>
+        <span id="txt_log_msg">日志内容</span>
+    </div>
+*/
+function info(desc) {
+    $("#txt_log").addClass("alert-info").removeClass("alert-error").removeClass("alert-warn");
+    $("#txt_log_title").text("Info:");
+    $("#txt_log_msg").text(desc);
+}
+function warn(code, desc) {
+    $("#txt_log").removeClass("alert-info").removeClass("alert-error").addClass("alert-warn");
+    $("#txt_log_title").text("Warn:");
+    $("#txt_log_msg").text("code: " + code + ", " + desc);
+}
+function error(code, desc) {
+    $("#txt_log").removeClass("alert-info").addClass("alert-error").removeClass("alert-warn");
+    $("#txt_log_title").text("Error:");
+    $("#txt_log_msg").text("code: " + code + ", " + desc);
+}
diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index b63df87c2..e8daafc1f 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -7,6 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 4b8e92da9..5b56d5b2f 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 9e2172a63..0eabae206 100755
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index dc9e6ab89..19637fe0e 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
@@ -420,7 +421,7 @@
                     if (realtime_player) {
                         // directly play the url for the realtime player.
                         realtime_player.stop();
-                        realtime_player.play(url);
+                        realtime_player.play(url, 0);
                     }
                 }
             });
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 9fab6b2ca..d1d6c5767 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index d129187e36f4acaa5bd3d4b0e3915ae05ddbde32..ef613534834633eb4c02069257bad79f0a5b7a9f 100755
GIT binary patch
literal 5333
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

literal 5274
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

diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as
index 84a27b619..07b36a7a0 100755
--- a/trunk/research/players/srs_player/src/srs_player.as
+++ b/trunk/research/players/srs_player/src/srs_player.as
@@ -10,6 +10,7 @@ package
     import flash.events.NetStatusEvent;
     import flash.events.TimerEvent;
     import flash.external.ExternalInterface;
+    import flash.media.SoundTransform;
     import flash.media.Video;
     import flash.net.NetConnection;
     import flash.net.NetStream;
@@ -19,6 +20,8 @@ package
     import flash.utils.Timer;
     import flash.utils.setTimeout;
     
+    import flashx.textLayout.formats.Float;
+    
     public class srs_player extends Sprite
     {
         // user set id.
@@ -280,8 +283,9 @@ package
          * @param _width, the player width.
          * @param _height, the player height.
          * @param buffer_time, the buffer time in seconds. recommend to >=0.5
+         * @param volume, the volume, 0 is mute, 1 is 100%, 2 is 200%.
          */
-        private function js_call_play(url:String, _width:int, _height:int, buffer_time:Number):void {
+        private function js_call_play(url:String, _width:int, _height:int, buffer_time:Number, volume:Number):void {
             this.user_url = url;
             this.user_w = _width;
             this.user_h = _height;
@@ -313,6 +317,7 @@ package
                 }
                 
                 media_stream = new NetStream(media_conn);
+                media_stream.soundTransform = new SoundTransform(volume);
                 media_stream.bufferTime = buffer_time;
                 media_stream.client = {};
                 media_stream.client.onMetaData = system_on_metadata;
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index cb3a4cae5..9deb86ebe 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index b9aaf49343221e403e259a1fd5bb2b4403f85a73..745b401faaa43cf614e085f70d93d64715175a1c 100755
GIT binary patch
literal 4608
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

literal 4524
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
K_1^-`OfK{8n%bBE

diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as
index 9baafe397..8d63004d3 100755
--- a/trunk/research/players/srs_publisher/src/srs_publisher.as
+++ b/trunk/research/players/srs_publisher/src/srs_publisher.as
@@ -10,6 +10,9 @@ package
     import flash.media.H264Profile;
     import flash.media.H264VideoStreamSettings;
     import flash.media.Microphone;
+    import flash.media.MicrophoneEnhancedMode;
+    import flash.media.MicrophoneEnhancedOptions;
+    import flash.media.SoundCodec;
     import flash.media.Video;
     import flash.net.NetConnection;
     import flash.net.NetStream;
@@ -135,27 +138,31 @@ package
             this.js_call_stop();
             
             // microphone and camera
-            var m:Microphone = Microphone.getMicrophone(acodec.device_code);
-            if(m == null){
+            var microphone:Microphone = null;
+            //microphone = Microphone.getEnhancedMicrophone(acodec.device_code);
+            if (!microphone) {
+                microphone = Microphone.getMicrophone(acodec.device_code);
+            }
+            if(microphone == null){
                 this.system_error(this.error_microphone_get, "failed to open microphone " + acodec.device_code + "(" + acodec.device_name + ")");
                 return;
             }
             // ignore muted, for flash will require user to access it.
             
             // Remark: the name is the index!
-            var c:Camera = Camera.getCamera(vcodec.device_code);
-            if(c == null){
+            var camera:Camera = Camera.getCamera(vcodec.device_code);
+            if(camera == null){
                 this.system_error(this.error_camera_get, "failed to open camera " + vcodec.device_code + "(" + vcodec.device_name + ")");
                 return;
             }
             // ignore muted, for flash will require user to access it.
             // but we still warn user.
-            if(c && c.muted){
+            if(camera && camera.muted){
                 this.system_warn(this.error_camera_muted, "Access Denied, camera " + vcodec.device_code + "(" + vcodec.device_name + ") is muted");
             }
             
-            this.media_camera = c;
-            this.media_microphone = m;
+            this.media_camera = camera;
+            this.media_microphone = microphone;
             
             this.media_conn = new NetConnection();
             this.media_conn.client = {};
@@ -188,14 +195,14 @@ package
                     // TODO: FIXME: failed event.
                 });
                 
-                __build_video_codec(media_stream, c, vcodec);
-                __build_audio_codec(media_stream, m, acodec);
+                __build_video_codec(media_stream, camera, vcodec);
+                __build_audio_codec(media_stream, microphone, acodec);
                 
                 if (media_microphone) {
-                    media_stream.attachAudio(m);
+                    media_stream.attachAudio(microphone);
                 }
                 if (media_camera) {
-                    media_stream.attachCamera(c);
+                    media_stream.attachCamera(camera);
                 }
                 
                 var streamName:String = url.substr(url.lastIndexOf("/"));
@@ -264,6 +271,10 @@ package
             // if your sound capture device supports this value. Otherwise, the default value is the next available capture level above 8 kHz that 
             // your sound capture device supports, usually 11 kHz.
             m.rate = microRate;
+            
+            // see: http://www.adobe.com/cn/devnet/flashplayer/articles/acoustic-echo-cancellation.html
+            m.codec = SoundCodec.SPEEX;
+            m.framesPerPacket = 1;
         }
         private function __build_video_codec(stream:NetStream, c:Camera, vcodec:Object):void {
             if (!c) {
@@ -332,9 +343,9 @@ package
             //		(highest quality, no compression). To specify that picture quality can vary as needed to avoid exceeding bandwidth, 
             //		pass 0 for quality.
             //  winlin:
-            //		bandwidth is in bps not kbps. 500*1000 = 500kbps.
+            //		bandwidth is in Bps not kbps. 
             //		quality=1 is lowest quality, 100 is highest quality.
-            c.setQuality(cameraBitrate * 1000, cameraQuality);
+            c.setQuality(cameraBitrate / 8.0 * 1000, cameraQuality);
         }
     }
 }
\ No newline at end of file
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
index f8f977b3d..f9644d013 100755
--- a/trunk/research/players/vlc.html
+++ b/trunk/research/players/vlc.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.log.js"></script>
     <style>
         body{
             padding-top: 55px;

From e64a11943b68c8474c90a317deae3af9db917bff Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 12:57:20 +0800
Subject: [PATCH 04/30] extract the components of js

---
 trunk/research/players/index.html             |   3 +-
 .../players/js/{srs.js => srs.page.js}        | 431 ------------------
 trunk/research/players/js/srs.player.js       | 191 ++++++++
 trunk/research/players/js/srs.publisher.js    | 148 ++++++
 trunk/research/players/js/srs.utility.js      |  83 ++++
 trunk/research/players/jwplayer6.html         |   5 +-
 trunk/research/players/osmf.html              |   5 +-
 trunk/research/players/srs_bwt.html           |   6 +-
 trunk/research/players/srs_chat.html          |   7 +-
 trunk/research/players/srs_player.html        |   5 +-
 trunk/research/players/srs_publisher.html     |   5 +-
 trunk/research/players/vlc.html               |   3 +-
 12 files changed, 450 insertions(+), 442 deletions(-)
 rename trunk/research/players/js/{srs.js => srs.page.js} (50%)
 create mode 100755 trunk/research/players/js/srs.player.js
 create mode 100755 trunk/research/players/js/srs.publisher.js
 create mode 100755 trunk/research/players/js/srs.utility.js

diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index f017d418a..b9938c0f6 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -7,8 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
-    <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/js/srs.js b/trunk/research/players/js/srs.page.js
similarity index 50%
rename from trunk/research/players/js/srs.js
rename to trunk/research/players/js/srs.page.js
index 0a9a28d47..709c9728e 100755
--- a/trunk/research/players/js/srs.js
+++ b/trunk/research/players/js/srs.page.js
@@ -26,18 +26,6 @@ function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_pla
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
-/**
-* padding the output.
-* padding(3, 5, '0') is 00003
-* padding(3, 5, 'x') is xxxx3
-* @see http://blog.csdn.net/win_lin/article/details/12065413
-*/
-function padding(number, length, prefix) {
-    if(String(number).length >= length){
-        return String(number);
-    }
-    return padding(prefix+number, length, prefix);
-}
 
 /**
 * update the navigator, add same query string.
@@ -52,40 +40,6 @@ function update_nav() {
     $("#nav_vlc").attr("href", "vlc.html" + window.location.search);
 }
 
-/**
-* parse the query string to object.
-*/
-function parse_query_string(){
-    var obj = {};
-    
-    // parse the host(hostname:http_port), pathname(dir/filename)
-    obj.host = window.location.host;
-    obj.hostname = window.location.hostname;
-    obj.http_port = (window.location.port == "")? 80:window.location.port;
-    obj.pathname = window.location.pathname;
-    if (obj.pathname.lastIndexOf("/") <= 0) {
-        obj.dir = "/";
-        obj.filename = "";
-    } else {
-        obj.dir = obj.pathname.substr(0, obj.pathname.lastIndexOf("/"));
-        obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/"));
-    }
-    
-    // parse the query string.
-    var query_string = String(window.location.search).replace(" ", "").split("?")[1];
-    if(query_string == undefined){
-        return obj;
-    }
-    
-    var queries = query_string.split("&");
-    $(queries).each(function(){
-        var query = this.split("=");
-        obj[query[0]] = query[1];
-    });
-    
-    return obj;
-}
-
 /**
 @param server the ip of server. default to window.location.hostname
 @param vhost the vhost of rtmp. default to window.location.hostname
@@ -156,43 +110,6 @@ function build_default_hls_url() {
     return "http://" + server + ":" + port + "/" + app + "/" + stream + ".m3u8";
 }
 
-/**
-* parse the rtmp url,
-* for example: rtmp://demo.srs.com:1935/live...vhost...players/livestream
-* @return object {server, port, vhost, app, stream}
-*/
-function srs_parse_rtmp_url(rtmp_url) {
-    // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri
-    var a = document.createElement("a");
-    a.href = rtmp_url.replace("rtmp://", "http://");
-    
-    var vhost = a.hostname;
-    var port = (a.port == "")? "1935":a.port;
-    var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
-    var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
-
-    // parse the vhost in the params of app, that srs supports.
-    app = app.replace("...vhost...", "?vhost=");
-    if (app.indexOf("?") >= 0) {
-        var params = app.substr(app.indexOf("?"));
-        app = app.substr(0, app.indexOf("?"));
-        
-        if (params.indexOf("vhost=") > 0) {
-            vhost = params.substr(params.indexOf("vhost=") + "vhost=".length);
-            if (vhost.indexOf("&") > 0) {
-                vhost = vhost.substr(0, vhost.indexOf("&"));
-            }
-        }
-    }
-    
-    var ret = {
-        server: a.hostname, port: port, 
-        vhost: vhost, app: app, stream: stream
-    };
-    
-    return ret;
-}
-
 /**
 * initialize the page.
 * @param rtmp_url the div id contains the rtmp stream url to play
@@ -404,351 +321,3 @@ function srs_publiser_get_codec(
     vcodec.size     = $(sl_size).find("option:selected").val();
     vcodec.bitrate  = $(sl_bitrate).find("option:selected").val();
 }
-
-//////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////
-/**
-* the SrsPlayer object.
-* @param container the html container id.
-* @param width a float value specifies the width of player.
-* @param height a float value specifies the height of player.
-* @param private_object [optional] an object that used as private object, 
-*       for example, the logic chat object which owner this player.
-*/
-function SrsPlayer(container, width, height, private_object) {
-    if (!SrsPlayer.__id) {
-        SrsPlayer.__id = 100;
-    }
-    if (!SrsPlayer.__players) {
-        SrsPlayer.__players = [];
-    }
-    
-    SrsPlayer.__players.push(this);
-    
-    this.private_object = private_object;
-    this.container = container;
-    this.width = width;
-    this.height = height;
-    this.id = SrsPlayer.__id++;
-    this.stream_url = null;
-    this.buffer_time = 0.8; // default to 0.8
-    this.volume = 1.0; // default to 100%
-    this.callbackObj = null;
-    
-    // callback set the following values.
-    this.meatadata = {}; // for on_player_metadata
-    this.time = 0; // current stream time.
-    this.buffer_length = 0; // current stream buffer length.
-}
-/**
-* user can set some callback, then start the player.
-* @param url the default url.
-* callbacks:
-*      on_player_ready():int, when srs player ready, user can play.
-*      on_player_metadata(metadata:Object):int, when srs player get metadata.
-*/
-SrsPlayer.prototype.start = function(url) {
-    if (url) {
-        this.stream_url = url;
-    }
-    
-    // embed the flash.
-    var flashvars = {};
-    flashvars.id = this.id;
-    flashvars.on_player_ready = "__srs_on_player_ready";
-    flashvars.on_player_metadata = "__srs_on_player_metadata";
-    flashvars.on_player_timer = "__srs_on_player_timer";
-    
-    var params = {};
-    params.wmode = "opaque";
-    params.allowFullScreen = "true";
-    params.allowScriptAccess = "always";
-    
-    var attributes = {};
-    
-    var self = this;
-    
-    swfobject.embedSWF(
-        "srs_player/release/srs_player.swf?_version="+srs_get_version_code(), 
-        this.container,
-        this.width, this.height,
-        "11.1", "js/AdobeFlashPlayerInstall.swf",
-        flashvars, params, attributes,
-        function(callbackObj){
-            self.callbackObj = callbackObj;
-        }
-    );
-    
-    return this;
-}
-/**
-* play the stream.
-* @param stream_url the url of stream, rtmp or http.
-* @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%.
-*/
-SrsPlayer.prototype.play = function(url, volume) {
-    if (url) {
-        this.stream_url = url;
-    }
-    
-    // volume maybe 0, so never use if(volume) to check its value.
-    if (volume != null && volume != undefined) {
-        this.volume = volume;
-    }
-    
-    this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time, this.volume);
-}
-SrsPlayer.prototype.stop = function() {
-    for (var i = 0; i < SrsPlayer.__players.length; i++) {
-        var player = SrsPlayer.__players[i];
-        
-        if (player.id != this.id) {
-            continue;
-        }
-        
-        SrsPlayer.__players.splice(i, 1);
-        break;
-    }
-    
-    this.callbackObj.ref.__stop();
-}
-SrsPlayer.prototype.pause = function() {
-    this.callbackObj.ref.__pause();
-}
-SrsPlayer.prototype.resume = function() {
-    this.callbackObj.ref.__resume();
-}
-/**
-* to set the DAR, for example, DAR=16:9
-* @param num, for example, 9. 
-*       use metadata height if 0.
-*       use user specified height if -1.
-* @param den, for example, 16. 
-*       use metadata width if 0.
-*       use user specified width if -1.
-*/
-SrsPlayer.prototype.dar = function(num, den) {
-    this.callbackObj.ref.__dar(num, den);
-}
-/**
-* set the fullscreen size data.
-* @refer the refer fullscreen mode. it can be:
-*       video: use video orignal size.
-*       screen: use screen size to rescale video.
-* @param percent, the rescale percent, where
-*       100 means 100%.
-*/
-SrsPlayer.prototype.set_fs = function(refer, percent) {
-    this.callbackObj.ref.__set_fs(refer, percent);
-}
-/**
-* set the stream buffer time in seconds.
-* @buffer_time the buffer time in seconds.
-*/
-SrsPlayer.prototype.set_bt = function(buffer_time) {
-    this.buffer_time = buffer_time;
-    this.callbackObj.ref.__set_bt(buffer_time);
-}
-SrsPlayer.prototype.on_player_ready = function() {
-}
-SrsPlayer.prototype.on_player_metadata = function(metadata) {
-    // ignore.
-}
-SrsPlayer.prototype.on_player_timer = function(time, buffer_length) {
-    // ignore.
-}
-function __srs_find_player(id) {
-    for (var i = 0; i < SrsPlayer.__players.length; i++) {
-        var player = SrsPlayer.__players[i];
-        
-        if (player.id != id) {
-            continue;
-        }
-        
-        return player;
-    }
-    
-    throw new Error("player not found. id=" + id);
-}
-function __srs_on_player_ready(id) {
-    var player = __srs_find_player(id);
-    player.on_player_ready();
-}
-function __srs_on_player_metadata(id, metadata) {
-    var player = __srs_find_player(id);
-    
-    // user may override the on_player_metadata, 
-    // so set the data before invoke it.
-    player.metadata = metadata;
-    
-    player.on_player_metadata(metadata);
-}
-function __srs_on_player_timer(id, time, buffer_length) {
-    var player = __srs_find_player(id);
-    
-    buffer_length = Math.max(0, buffer_length);
-    buffer_length = Math.min(player.buffer_time, buffer_length);
-    
-    time = Math.max(0, time);
-    
-    // user may override the on_player_timer, 
-    // so set the data before invoke it.
-    player.time = time;
-    player.buffer_length = buffer_length;
-    
-    player.on_player_timer(time, buffer_length);
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////
-/**
-* the SrsPublisher object.
-* @param container the html container id.
-* @param width a float value specifies the width of publisher.
-* @param height a float value specifies the height of publisher.
-* @param private_object [optional] an object that used as private object, 
-*       for example, the logic chat object which owner this publisher.
-*/
-function SrsPublisher(container, width, height, private_object) {
-    if (!SrsPublisher.__id) {
-        SrsPublisher.__id = 100;
-    }
-    if (!SrsPublisher.__publishers) {
-        SrsPublisher.__publishers = [];
-    }
-    
-    SrsPublisher.__publishers.push(this);
-    
-    this.private_object = private_object;
-    this.container = container;
-    this.width = width;
-    this.height = height;
-    this.id = SrsPublisher.__id++;
-    this.callbackObj = null;
-    
-    // set the values when publish.
-    this.url = null;
-    this.vcodec = {};
-    this.acodec = {};
-    
-    // callback set the following values.
-    this.cameras = [];
-    this.microphones = [];
-    this.code = 0;
-    
-    // error code defines.
-    this.errors = {
-        "100": "无法获取指定的摄像头", //error_camera_get 
-        "101": "无法获取指定的麦克风", //error_microphone_get 
-        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头" //error_camera_muted 
-    };
-}
-/**
-* user can set some callback, then start the publisher.
-* callbacks:
-*      on_publisher_ready(cameras, microphones):int, when srs publisher ready, user can publish.
-*      on_publisher_error(code, desc):int, when srs publisher error, callback this method.
-*      on_publisher_warn(code, desc):int, when srs publisher warn, callback this method.
-*/
-SrsPublisher.prototype.start = function() {
-    // embed the flash.
-    var flashvars = {};
-    flashvars.id = this.id;
-    flashvars.on_publisher_ready = "__srs_on_publisher_ready";
-    flashvars.on_publisher_error = "__srs_on_publisher_error";
-    flashvars.on_publisher_warn = "__srs_on_publisher_warn";
-    
-    var params = {};
-    params.wmode = "opaque";
-    params.allowFullScreen = "true";
-    params.allowScriptAccess = "always";
-    
-    var attributes = {};
-    
-    var self = this;
-    
-    swfobject.embedSWF(
-        "srs_publisher/release/srs_publisher.swf?_version="+srs_get_version_code(), 
-        this.container,
-        this.width, this.height,
-        "11.1", "js/AdobeFlashPlayerInstall.swf",
-        flashvars, params, attributes,
-        function(callbackObj){
-            self.callbackObj = callbackObj;
-        }
-    );
-    
-    return this;
-}
-/**
-* publish stream to server.
-* @param url a string indicates the rtmp url to publish.
-* @param vcodec an object contains the video codec info.
-* @param acodec an object contains the audio codec info.
-*/
-SrsPublisher.prototype.publish = function(url, vcodec, acodec) {
-    this.url = url;
-    this.vcodec = vcodec;
-    this.acodec = acodec;
-    
-    this.callbackObj.ref.__publish(url, this.width, this.height, vcodec, acodec);
-}
-SrsPublisher.prototype.stop = function() {
-    this.callbackObj.ref.__stop();
-}
-/**
-* when publisher ready.
-* @param cameras a string array contains the names of cameras.
-* @param microphones a string array contains the names of microphones.
-*/
-SrsPublisher.prototype.on_publisher_ready = function(cameras, microphones) {
-}
-/**
-* when publisher error.
-* @code the error code.
-* @desc the error desc message.
-*/
-SrsPublisher.prototype.on_publisher_error = function(code, desc) {
-    throw new Error("publisher error. code=" + code + ", desc=" + desc);
-}
-SrsPublisher.prototype.on_publisher_warn = function(code, desc) {
-    throw new Error("publisher warn. code=" + code + ", desc=" + desc);
-}
-function __srs_find_publisher(id) {
-    for (var i = 0; i < SrsPublisher.__publishers.length; i++) {
-        var publisher = SrsPublisher.__publishers[i];
-        
-        if (publisher.id != id) {
-            continue;
-        }
-        
-        return publisher;
-    }
-    
-    throw new Error("publisher not found. id=" + id);
-}
-function __srs_on_publisher_ready(id, cameras, microphones) {
-    var publisher = __srs_find_publisher(id);
-    
-    publisher.cameras = cameras;
-    publisher.microphones = microphones;
-    
-    publisher.on_publisher_ready(cameras, microphones);
-}
-function __srs_on_publisher_error(id, code) {
-    var publisher = __srs_find_publisher(id);
-    
-    publisher.code = code;
-    
-    publisher.on_publisher_error(code, publisher.errors[""+code]);
-}
-function __srs_on_publisher_warn(id, code) {
-    var publisher = __srs_find_publisher(id);
-    
-    publisher.code = code;
-    
-    publisher.on_publisher_warn(code, publisher.errors[""+code]);
-}
-
diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js
new file mode 100755
index 000000000..2896d5649
--- /dev/null
+++ b/trunk/research/players/js/srs.player.js
@@ -0,0 +1,191 @@
+/**
+* the SrsPlayer object.
+* @param container the html container id.
+* @param width a float value specifies the width of player.
+* @param height a float value specifies the height of player.
+* @param private_object [optional] an object that used as private object, 
+*       for example, the logic chat object which owner this player.
+*/
+function SrsPlayer(container, width, height, private_object) {
+    if (!SrsPlayer.__id) {
+        SrsPlayer.__id = 100;
+    }
+    if (!SrsPlayer.__players) {
+        SrsPlayer.__players = [];
+    }
+    
+    SrsPlayer.__players.push(this);
+    
+    this.private_object = private_object;
+    this.container = container;
+    this.width = width;
+    this.height = height;
+    this.id = SrsPlayer.__id++;
+    this.stream_url = null;
+    this.buffer_time = 0.8; // default to 0.8
+    this.volume = 1.0; // default to 100%
+    this.callbackObj = null;
+    
+    // callback set the following values.
+    this.meatadata = {}; // for on_player_metadata
+    this.time = 0; // current stream time.
+    this.buffer_length = 0; // current stream buffer length.
+}
+/**
+* user can set some callback, then start the player.
+* @param url the default url.
+* callbacks:
+*      on_player_ready():int, when srs player ready, user can play.
+*      on_player_metadata(metadata:Object):int, when srs player get metadata.
+*/
+SrsPlayer.prototype.start = function(url) {
+    if (url) {
+        this.stream_url = url;
+    }
+    
+    // embed the flash.
+    var flashvars = {};
+    flashvars.id = this.id;
+    flashvars.on_player_ready = "__srs_on_player_ready";
+    flashvars.on_player_metadata = "__srs_on_player_metadata";
+    flashvars.on_player_timer = "__srs_on_player_timer";
+    
+    var params = {};
+    params.wmode = "opaque";
+    params.allowFullScreen = "true";
+    params.allowScriptAccess = "always";
+    
+    var attributes = {};
+    
+    var self = this;
+    
+    swfobject.embedSWF(
+        "srs_player/release/srs_player.swf?_version="+srs_get_version_code(), 
+        this.container,
+        this.width, this.height,
+        "11.1", "js/AdobeFlashPlayerInstall.swf",
+        flashvars, params, attributes,
+        function(callbackObj){
+            self.callbackObj = callbackObj;
+        }
+    );
+    
+    return this;
+}
+/**
+* play the stream.
+* @param stream_url the url of stream, rtmp or http.
+* @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%.
+*/
+SrsPlayer.prototype.play = function(url, volume) {
+    if (url) {
+        this.stream_url = url;
+    }
+    
+    // volume maybe 0, so never use if(volume) to check its value.
+    if (volume != null && volume != undefined) {
+        this.volume = volume;
+    }
+    
+    this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time, this.volume);
+}
+SrsPlayer.prototype.stop = function() {
+    for (var i = 0; i < SrsPlayer.__players.length; i++) {
+        var player = SrsPlayer.__players[i];
+        
+        if (player.id != this.id) {
+            continue;
+        }
+        
+        SrsPlayer.__players.splice(i, 1);
+        break;
+    }
+    
+    this.callbackObj.ref.__stop();
+}
+SrsPlayer.prototype.pause = function() {
+    this.callbackObj.ref.__pause();
+}
+SrsPlayer.prototype.resume = function() {
+    this.callbackObj.ref.__resume();
+}
+/**
+* to set the DAR, for example, DAR=16:9
+* @param num, for example, 9. 
+*       use metadata height if 0.
+*       use user specified height if -1.
+* @param den, for example, 16. 
+*       use metadata width if 0.
+*       use user specified width if -1.
+*/
+SrsPlayer.prototype.dar = function(num, den) {
+    this.callbackObj.ref.__dar(num, den);
+}
+/**
+* set the fullscreen size data.
+* @refer the refer fullscreen mode. it can be:
+*       video: use video orignal size.
+*       screen: use screen size to rescale video.
+* @param percent, the rescale percent, where
+*       100 means 100%.
+*/
+SrsPlayer.prototype.set_fs = function(refer, percent) {
+    this.callbackObj.ref.__set_fs(refer, percent);
+}
+/**
+* set the stream buffer time in seconds.
+* @buffer_time the buffer time in seconds.
+*/
+SrsPlayer.prototype.set_bt = function(buffer_time) {
+    this.buffer_time = buffer_time;
+    this.callbackObj.ref.__set_bt(buffer_time);
+}
+SrsPlayer.prototype.on_player_ready = function() {
+}
+SrsPlayer.prototype.on_player_metadata = function(metadata) {
+    // ignore.
+}
+SrsPlayer.prototype.on_player_timer = function(time, buffer_length) {
+    // ignore.
+}
+function __srs_find_player(id) {
+    for (var i = 0; i < SrsPlayer.__players.length; i++) {
+        var player = SrsPlayer.__players[i];
+        
+        if (player.id != id) {
+            continue;
+        }
+        
+        return player;
+    }
+    
+    throw new Error("player not found. id=" + id);
+}
+function __srs_on_player_ready(id) {
+    var player = __srs_find_player(id);
+    player.on_player_ready();
+}
+function __srs_on_player_metadata(id, metadata) {
+    var player = __srs_find_player(id);
+    
+    // user may override the on_player_metadata, 
+    // so set the data before invoke it.
+    player.metadata = metadata;
+    
+    player.on_player_metadata(metadata);
+}
+function __srs_on_player_timer(id, time, buffer_length) {
+    var player = __srs_find_player(id);
+    
+    buffer_length = Math.max(0, buffer_length);
+    buffer_length = Math.min(player.buffer_time, buffer_length);
+    
+    time = Math.max(0, time);
+    
+    // user may override the on_player_timer, 
+    // so set the data before invoke it.
+    player.time = time;
+    player.buffer_length = buffer_length;
+    
+    player.on_player_timer(time, buffer_length);
+}
diff --git a/trunk/research/players/js/srs.publisher.js b/trunk/research/players/js/srs.publisher.js
new file mode 100755
index 000000000..43823b744
--- /dev/null
+++ b/trunk/research/players/js/srs.publisher.js
@@ -0,0 +1,148 @@
+/**
+* the SrsPublisher object.
+* @param container the html container id.
+* @param width a float value specifies the width of publisher.
+* @param height a float value specifies the height of publisher.
+* @param private_object [optional] an object that used as private object, 
+*       for example, the logic chat object which owner this publisher.
+*/
+function SrsPublisher(container, width, height, private_object) {
+    if (!SrsPublisher.__id) {
+        SrsPublisher.__id = 100;
+    }
+    if (!SrsPublisher.__publishers) {
+        SrsPublisher.__publishers = [];
+    }
+    
+    SrsPublisher.__publishers.push(this);
+    
+    this.private_object = private_object;
+    this.container = container;
+    this.width = width;
+    this.height = height;
+    this.id = SrsPublisher.__id++;
+    this.callbackObj = null;
+    
+    // set the values when publish.
+    this.url = null;
+    this.vcodec = {};
+    this.acodec = {};
+    
+    // callback set the following values.
+    this.cameras = [];
+    this.microphones = [];
+    this.code = 0;
+    
+    // error code defines.
+    this.errors = {
+        "100": "无法获取指定的摄像头", //error_camera_get 
+        "101": "无法获取指定的麦克风", //error_microphone_get 
+        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头" //error_camera_muted 
+    };
+}
+/**
+* user can set some callback, then start the publisher.
+* callbacks:
+*      on_publisher_ready(cameras, microphones):int, when srs publisher ready, user can publish.
+*      on_publisher_error(code, desc):int, when srs publisher error, callback this method.
+*      on_publisher_warn(code, desc):int, when srs publisher warn, callback this method.
+*/
+SrsPublisher.prototype.start = function() {
+    // embed the flash.
+    var flashvars = {};
+    flashvars.id = this.id;
+    flashvars.on_publisher_ready = "__srs_on_publisher_ready";
+    flashvars.on_publisher_error = "__srs_on_publisher_error";
+    flashvars.on_publisher_warn = "__srs_on_publisher_warn";
+    
+    var params = {};
+    params.wmode = "opaque";
+    params.allowFullScreen = "true";
+    params.allowScriptAccess = "always";
+    
+    var attributes = {};
+    
+    var self = this;
+    
+    swfobject.embedSWF(
+        "srs_publisher/release/srs_publisher.swf?_version="+srs_get_version_code(), 
+        this.container,
+        this.width, this.height,
+        "11.1", "js/AdobeFlashPlayerInstall.swf",
+        flashvars, params, attributes,
+        function(callbackObj){
+            self.callbackObj = callbackObj;
+        }
+    );
+    
+    return this;
+}
+/**
+* publish stream to server.
+* @param url a string indicates the rtmp url to publish.
+* @param vcodec an object contains the video codec info.
+* @param acodec an object contains the audio codec info.
+*/
+SrsPublisher.prototype.publish = function(url, vcodec, acodec) {
+    this.url = url;
+    this.vcodec = vcodec;
+    this.acodec = acodec;
+    
+    this.callbackObj.ref.__publish(url, this.width, this.height, vcodec, acodec);
+}
+SrsPublisher.prototype.stop = function() {
+    this.callbackObj.ref.__stop();
+}
+/**
+* when publisher ready.
+* @param cameras a string array contains the names of cameras.
+* @param microphones a string array contains the names of microphones.
+*/
+SrsPublisher.prototype.on_publisher_ready = function(cameras, microphones) {
+}
+/**
+* when publisher error.
+* @code the error code.
+* @desc the error desc message.
+*/
+SrsPublisher.prototype.on_publisher_error = function(code, desc) {
+    throw new Error("publisher error. code=" + code + ", desc=" + desc);
+}
+SrsPublisher.prototype.on_publisher_warn = function(code, desc) {
+    throw new Error("publisher warn. code=" + code + ", desc=" + desc);
+}
+function __srs_find_publisher(id) {
+    for (var i = 0; i < SrsPublisher.__publishers.length; i++) {
+        var publisher = SrsPublisher.__publishers[i];
+        
+        if (publisher.id != id) {
+            continue;
+        }
+        
+        return publisher;
+    }
+    
+    throw new Error("publisher not found. id=" + id);
+}
+function __srs_on_publisher_ready(id, cameras, microphones) {
+    var publisher = __srs_find_publisher(id);
+    
+    publisher.cameras = cameras;
+    publisher.microphones = microphones;
+    
+    publisher.on_publisher_ready(cameras, microphones);
+}
+function __srs_on_publisher_error(id, code) {
+    var publisher = __srs_find_publisher(id);
+    
+    publisher.code = code;
+    
+    publisher.on_publisher_error(code, publisher.errors[""+code]);
+}
+function __srs_on_publisher_warn(id, code) {
+    var publisher = __srs_find_publisher(id);
+    
+    publisher.code = code;
+    
+    publisher.on_publisher_warn(code, publisher.errors[""+code]);
+}
diff --git a/trunk/research/players/js/srs.utility.js b/trunk/research/players/js/srs.utility.js
new file mode 100755
index 000000000..19b715859
--- /dev/null
+++ b/trunk/research/players/js/srs.utility.js
@@ -0,0 +1,83 @@
+/**
+* padding the output.
+* padding(3, 5, '0') is 00003
+* padding(3, 5, 'x') is xxxx3
+* @see http://blog.csdn.net/win_lin/article/details/12065413
+*/
+function padding(number, length, prefix) {
+    if(String(number).length >= length){
+        return String(number);
+    }
+    return padding(prefix+number, length, prefix);
+}
+
+/**
+* parse the query string to object.
+*/
+function parse_query_string(){
+    var obj = {};
+    
+    // parse the host(hostname:http_port), pathname(dir/filename)
+    obj.host = window.location.host;
+    obj.hostname = window.location.hostname;
+    obj.http_port = (window.location.port == "")? 80:window.location.port;
+    obj.pathname = window.location.pathname;
+    if (obj.pathname.lastIndexOf("/") <= 0) {
+        obj.dir = "/";
+        obj.filename = "";
+    } else {
+        obj.dir = obj.pathname.substr(0, obj.pathname.lastIndexOf("/"));
+        obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/"));
+    }
+    
+    // parse the query string.
+    var query_string = String(window.location.search).replace(" ", "").split("?")[1];
+    if(query_string == undefined){
+        return obj;
+    }
+    
+    var queries = query_string.split("&");
+    $(queries).each(function(){
+        var query = this.split("=");
+        obj[query[0]] = query[1];
+    });
+    
+    return obj;
+}
+
+/**
+* parse the rtmp url,
+* for example: rtmp://demo.srs.com:1935/live...vhost...players/livestream
+* @return object {server, port, vhost, app, stream}
+*/
+function srs_parse_rtmp_url(rtmp_url) {
+    // @see: http://stackoverflow.com/questions/10469575/how-to-use-location-object-to-parse-url-without-redirecting-the-page-in-javascri
+    var a = document.createElement("a");
+    a.href = rtmp_url.replace("rtmp://", "http://");
+    
+    var vhost = a.hostname;
+    var port = (a.port == "")? "1935":a.port;
+    var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
+    var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
+
+    // parse the vhost in the params of app, that srs supports.
+    app = app.replace("...vhost...", "?vhost=");
+    if (app.indexOf("?") >= 0) {
+        var params = app.substr(app.indexOf("?"));
+        app = app.substr(0, app.indexOf("?"));
+        
+        if (params.indexOf("vhost=") > 0) {
+            vhost = params.substr(params.indexOf("vhost=") + "vhost=".length);
+            if (vhost.indexOf("&") > 0) {
+                vhost = vhost.substr(0, vhost.indexOf("&"));
+            }
+        }
+    }
+    
+    var ret = {
+        server: a.hostname, port: port, 
+        vhost: vhost, app: app, stream: stream
+    };
+    
+    return ret;
+}
diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index e8daafc1f..91eebbf82 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -6,8 +6,11 @@
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 5b56d5b2f..9a4244e74 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -7,8 +7,11 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 0eabae206..095c910b7 100755
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -7,8 +7,12 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 19637fe0e..046964aff 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -7,8 +7,11 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
@@ -415,7 +418,7 @@
                     
                     $("#btn_join").text("退出会议");
                 
-                    info("开始推流到服务器");
+                    info("开始推流到服务器。请戴耳机聊天，否则音箱的声音会进入麦克风");
                     srs_publisher.publish(url, vcodec, acodec);
                 
                     if (realtime_player) {
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index d1d6c5767..64b5ab4b2 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -7,8 +7,11 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 9deb86ebe..c48df777f 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -7,8 +7,11 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.player.js"></script>
+    <script type="text/javascript" src="js/srs.publisher.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
index f9644d013..2cd976676 100755
--- a/trunk/research/players/vlc.html
+++ b/trunk/research/players/vlc.html
@@ -7,8 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
-    <script type="text/javascript" src="js/srs.js"></script>
-    <script type="text/javascript" src="js/srs.log.js"></script>
+    <script type="text/javascript" src="js/srs.page.js"></script>
     <style>
         body{
             padding-top: 55px;

From b36d31b84c1a30c7d56242b6bb164f4e8ce5d28b Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 12:57:30 +0800
Subject: [PATCH 05/30] extract the components of js

---
 .../research/players/js/AdobeFlashPlayerInstall.swf | Bin
 trunk/research/players/js/bootstrap.min.js          |   0
 trunk/research/players/js/jquery-1.10.2.min.js      |   0
 trunk/research/players/js/jquery-1.10.2.min.map     |   0
 trunk/research/players/js/srs.log.js                |   0
 trunk/research/players/js/srs.page.js               |   0
 trunk/research/players/js/srs.player.js             |   0
 trunk/research/players/js/srs.publisher.js          |   0
 trunk/research/players/js/srs.utility.js            |   0
 9 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 trunk/research/players/js/AdobeFlashPlayerInstall.swf
 mode change 100755 => 100644 trunk/research/players/js/bootstrap.min.js
 mode change 100755 => 100644 trunk/research/players/js/jquery-1.10.2.min.js
 mode change 100755 => 100644 trunk/research/players/js/jquery-1.10.2.min.map
 mode change 100755 => 100644 trunk/research/players/js/srs.log.js
 mode change 100755 => 100644 trunk/research/players/js/srs.page.js
 mode change 100755 => 100644 trunk/research/players/js/srs.player.js
 mode change 100755 => 100644 trunk/research/players/js/srs.publisher.js
 mode change 100755 => 100644 trunk/research/players/js/srs.utility.js

diff --git a/trunk/research/players/js/AdobeFlashPlayerInstall.swf b/trunk/research/players/js/AdobeFlashPlayerInstall.swf
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/bootstrap.min.js b/trunk/research/players/js/bootstrap.min.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/jquery-1.10.2.min.js b/trunk/research/players/js/jquery-1.10.2.min.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/jquery-1.10.2.min.map b/trunk/research/players/js/jquery-1.10.2.min.map
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/srs.log.js b/trunk/research/players/js/srs.log.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/srs.publisher.js b/trunk/research/players/js/srs.publisher.js
old mode 100755
new mode 100644
diff --git a/trunk/research/players/js/srs.utility.js b/trunk/research/players/js/srs.utility.js
old mode 100755
new mode 100644

From 4b12724abc00e3f8817f45254d273b541760ada1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 12:58:15 +0800
Subject: [PATCH 06/30] change ui version to 1.11

---
 trunk/research/players/js/srs.page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 709c9728e..fff3ccb97 100644
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -10,7 +10,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
 // to query the swf anti cache.
-function srs_get_version_code() { return "1.9"; }
+function srs_get_version_code() { return "1.11"; }
 // get the default vhost for players.
 function srs_get_player_vhost() { return "players"; }
 // the api server port, for chat room.

From f308cc39ef1e47f4ab492a458c1c672bb378ecd8 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 13:16:41 +0800
Subject: [PATCH 07/30] change volume to 2.0

---
 trunk/research/players/srs_chat.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 046964aff..49d37c239 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -253,6 +253,7 @@
                     if (!chat || !chat.player) {
                         return;
                     }
+                    chat.player.volume = 2.0;
                     chat.player.play();
                 });
             }

From ffda615124fb08435d79e3409ab1cee3472dbf21 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 13:40:30 +0800
Subject: [PATCH 08/30] auto play, donot scale audio volume

---
 trunk/research/players/srs_chat.html          |   7 ++++---
 .../players/srs_player/release/srs_player.swf | Bin 5333 -> 5332 bytes
 .../srs_publisher/release/srs_publisher.swf   | Bin 4608 -> 4609 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 49d37c239..06c6c9600 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -78,7 +78,6 @@
                 realtime_player = new SrsPlayer("realtime_player", 430, 185);
                 realtime_player.on_player_ready = function() {
                     this.set_bt(0.5);
-                    this.set_fs("screen", 100);
                 };
                 realtime_player.start();
             }
@@ -230,6 +229,7 @@
                     var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat);
                     _player.on_player_ready = function() {
                         this.set_bt(0.5);
+                        this.play();
                         this.set_fs("screen", 100);
                     };
                     _player.start(chat.url);
@@ -253,8 +253,8 @@
                     if (!chat || !chat.player) {
                         return;
                     }
-                    chat.player.volume = 2.0;
                     chat.player.play();
+                    chat.player.set_fs("screen", 100);
                 });
             }
             
@@ -426,6 +426,7 @@
                         // directly play the url for the realtime player.
                         realtime_player.stop();
                         realtime_player.play(url, 0);
+                        realtime_player.set_fs("screen", 100);
                     }
                 }
             });
@@ -512,7 +513,7 @@
                     <img src="img/tooltip.png"/>
                 </span>
             </div>
-            <div id="collapseM" class="accordion-body collapse">
+            <div id="collapseM" class="accordion-body collapse in">
                 <div class="accordion-inner">
                     <div class="row-fluid">
                         <div class="span2">
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index ef613534834633eb4c02069257bad79f0a5b7a9f..e57129fdc383c23ce2e07fbb75bce48c29dc8d7d 100755
GIT binary patch
literal 5332
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

literal 5333
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

diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index 745b401faaa43cf614e085f70d93d64715175a1c..600127ded749f30d95b40862029c8858c7c57b94 100755
GIT binary patch
delta 4515
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
B#4Z2;

delta 4514
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
A>;M1&


From 836bc413f93b83f65a0d2ef316110bd478a8042e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 14:39:54 +0800
Subject: [PATCH 09/30] fix the bug of publish, server close the connection
 when timeout.

---
 trunk/research/api-server/server.py           |   2 +-
 trunk/research/players/js/srs.player.js       |   0
 trunk/research/players/js/srs.publisher.js    |  23 ++++++++++++------
 trunk/research/players/srs_chat.html          |  10 +++-----
 trunk/research/players/srs_publisher.html     |   2 +-
 .../srs_publisher/release/srs_publisher.swf   | Bin 4609 -> 4742 bytes
 .../srs_publisher/src/srs_publisher.as        |  13 ++++++++++
 7 files changed, 35 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 trunk/research/players/js/srs.player.js
 mode change 100644 => 100755 trunk/research/players/js/srs.publisher.js

diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py
index 5e860145f..99918cd87 100755
--- a/trunk/research/api-server/server.py
+++ b/trunk/research/api-server/server.py
@@ -343,7 +343,7 @@ class RESTChats(object):
         self.__chat_lock = threading.Lock();
 
         # dead time in seconds, if exceed, remove the chat.
-        self.__dead_time = 30;
+        self.__dead_time = 15;
 
     def GET(self):
         enable_crossdomain()
diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/srs.publisher.js b/trunk/research/players/js/srs.publisher.js
old mode 100644
new mode 100755
index 43823b744..b46d51ef7
--- a/trunk/research/players/js/srs.publisher.js
+++ b/trunk/research/players/js/srs.publisher.js
@@ -35,9 +35,12 @@ function SrsPublisher(container, width, height, private_object) {
     
     // error code defines.
     this.errors = {
-        "100": "无法获取指定的摄像头", //error_camera_get 
-        "101": "无法获取指定的麦克风", //error_microphone_get 
-        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头" //error_camera_muted 
+        "100": "无法获取指定的摄像头。", //error_camera_get 
+        "101": "无法获取指定的麦克风。", //error_microphone_get 
+        "102": "摄像头为禁用状态，推流时请允许flash访问摄像头。", //error_camera_muted 
+        "103": "服务器关闭了连接。", //error_connection_closed 
+        "104": "服务器连接失败。", //error_connection_failed 
+        "199": "未知错误。"
     };
 }
 /**
@@ -84,11 +87,17 @@ SrsPublisher.prototype.start = function() {
 * @param acodec an object contains the audio codec info.
 */
 SrsPublisher.prototype.publish = function(url, vcodec, acodec) {
-    this.url = url;
-    this.vcodec = vcodec;
-    this.acodec = acodec;
+    if (url) {
+        this.url = url;
+    }
+    if (vcodec) {
+        this.vcodec = vcodec;
+    }
+    if (acodec) {
+        this.acodec = acodec;
+    }
     
-    this.callbackObj.ref.__publish(url, this.width, this.height, vcodec, acodec);
+    this.callbackObj.ref.__publish(this.url, this.width, this.height, this.vcodec, this.acodec);
 }
 SrsPublisher.prototype.stop = function() {
     this.callbackObj.ref.__stop();
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 06c6c9600..23de8b3f3 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -64,7 +64,7 @@
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
-                error(code, desc);
+                error(code, desc + "请重试。");
             };
             srs_publisher.on_publisher_warn = function(code, desc) {
                 warn(code, desc);
@@ -78,6 +78,7 @@
                 realtime_player = new SrsPlayer("realtime_player", 430, 185);
                 realtime_player.on_player_ready = function() {
                     this.set_bt(0.5);
+                    this.set_fs("screen", 100);
                 };
                 realtime_player.start();
             }
@@ -229,7 +230,6 @@
                     var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat);
                     _player.on_player_ready = function() {
                         this.set_bt(0.5);
-                        this.play();
                         this.set_fs("screen", 100);
                     };
                     _player.start(chat.url);
@@ -254,7 +254,6 @@
                         return;
                     }
                     chat.player.play();
-                    chat.player.set_fs("screen", 100);
                 });
             }
             
@@ -419,14 +418,13 @@
                     
                     $("#btn_join").text("退出会议");
                 
-                    info("开始推流到服务器。请戴耳机聊天，否则音箱的声音会进入麦克风");
+                    info("开始推流到服务器。请戴耳机聊天，否则音箱的声音会进入麦克风造成回声。");
                     srs_publisher.publish(url, vcodec, acodec);
                 
                     if (realtime_player) {
                         // directly play the url for the realtime player.
                         realtime_player.stop();
                         realtime_player.play(url, 0);
-                        realtime_player.set_fs("screen", 100);
                     }
                 }
             });
@@ -513,7 +511,7 @@
                     <img src="img/tooltip.png"/>
                 </span>
             </div>
-            <div id="collapseM" class="accordion-body collapse in">
+            <div id="collapseM" class="accordion-body collapse">
                 <div class="accordion-inner">
                     <div class="row-fluid">
                         <div class="span2">
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index c48df777f..b587720f8 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -64,7 +64,7 @@
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
-                error(code, desc);
+                error(code, desc + "请重试。");
             };
             srs_publisher.on_publisher_warn = function(code, desc) {
                 warn(code, desc);
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index 600127ded749f30d95b40862029c8858c7c57b94..c4d2fd2fe6645b5cd1b52be5c726c071623a1da8 100755
GIT binary patch
literal 4742
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
Ug=oHt5B{%UH~!H06Kcl9H9Wf|S^xk5

literal 4609
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

diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as
index 8d63004d3..3a4458e5f 100755
--- a/trunk/research/players/srs_publisher/src/srs_publisher.as
+++ b/trunk/research/players/srs_publisher/src/srs_publisher.as
@@ -48,6 +48,8 @@ package
         private const error_camera_get:int = 100;
         private const error_microphone_get:int = 101;
         private const error_camera_muted:int = 102;
+        private const error_connection_closed:int = 103;
+        private const error_connection_failed:int = 104;
         
         public function srs_publisher()
         {
@@ -181,6 +183,17 @@ package
                     }
                     contextMenu.customItems = customItems;
                 }
+
+                if (evt.info.code == "NetConnection.Connect.Closed") {
+                    js_call_stop();
+                    system_error(error_connection_closed, "server closed the connection");
+                    return;
+                }
+                if (evt.info.code == "NetConnection.Connect.Failed") {
+                    js_call_stop();
+                    system_error(error_connection_failed, "connect to server failed");
+                    return;
+                }
                 
                 // TODO: FIXME: failed event.
                 if (evt.info.code != "NetConnection.Connect.Success") {

From 3ab867d907c492fa4ef066e80027a27c758bd7e4 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 14:59:19 +0800
Subject: [PATCH 10/30] fix bug of player dar.

---
 trunk/research/players/js/srs.player.js       |   7 +++++--
 trunk/research/players/srs_chat.html          |  10 ++++++++--
 trunk/research/players/srs_player.html        |   2 +-
 .../players/srs_player/release/srs_player.swf | Bin 5332 -> 5333 bytes
 .../players/srs_player/src/srs_player.as      |   4 ++--
 trunk/research/players/srs_publisher.html     |  10 ++++++++--
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js
index 2896d5649..1b1d7a882 100755
--- a/trunk/research/players/js/srs.player.js
+++ b/trunk/research/players/js/srs.player.js
@@ -78,6 +78,9 @@ SrsPlayer.prototype.start = function(url) {
 * @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%.
 */
 SrsPlayer.prototype.play = function(url, volume) {
+    this.stop();
+    SrsPlayer.__players.push(this);
+    
     if (url) {
         this.stream_url = url;
     }
@@ -118,8 +121,8 @@ SrsPlayer.prototype.resume = function() {
 *       use metadata width if 0.
 *       use user specified width if -1.
 */
-SrsPlayer.prototype.dar = function(num, den) {
-    this.callbackObj.ref.__dar(num, den);
+SrsPlayer.prototype.set_dar = function(num, den) {
+    this.callbackObj.ref.__set_dar(num, den);
 }
 /**
 * set the fullscreen size data.
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 23de8b3f3..270322d91 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -78,8 +78,11 @@
                 realtime_player = new SrsPlayer("realtime_player", 430, 185);
                 realtime_player.on_player_ready = function() {
                     this.set_bt(0.5);
-                    this.set_fs("screen", 100);
                 };
+                realtime_player.on_player_metadata = function(metadata) {
+                    this.set_dar(0, 0);
+                    this.set_fs("screen", 100);
+                }
                 realtime_player.start();
             }
             
@@ -230,8 +233,11 @@
                     var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat);
                     _player.on_player_ready = function() {
                         this.set_bt(0.5);
-                        this.set_fs("screen", 100);
                     };
+                    _player.on_player_metadata = function(metadata) {
+                        this.set_dar(0, 0);
+                        this.set_fs("screen", 100);
+                    }
                     _player.start(chat.url);
                     
                     chat.player = _player;
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 64b5ab4b2..5ebc545fb 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -34,7 +34,7 @@
         
         var __active_dar = null;
         function select_dar(dar_id, num, den) {
-            srs_player.dar(num, den);
+            srs_player.set_dar(num, den);
             
             if (__active_dar) {
                 __active_dar.removeClass("active");
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index e57129fdc383c23ce2e07fbb75bce48c29dc8d7d..176e8d6be3984d2c84fb206f712f6529d5f5726a 100755
GIT binary patch
literal 5333
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

literal 5332
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

diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as
index 07b36a7a0..4e4891a05 100755
--- a/trunk/research/players/srs_player/src/srs_player.as
+++ b/trunk/research/players/srs_player/src/srs_player.as
@@ -115,7 +115,7 @@ package
             flash.external.ExternalInterface.addCallback("__stop", this.js_call_stop);
             flash.external.ExternalInterface.addCallback("__pause", this.js_call_pause);
             flash.external.ExternalInterface.addCallback("__resume", this.js_call_resume);
-            flash.external.ExternalInterface.addCallback("__dar", this.js_call_dar);
+            flash.external.ExternalInterface.addCallback("__set_dar", this.js_call_set_dar);
             flash.external.ExternalInterface.addCallback("__set_fs", this.js_call_set_fs_size);
             flash.external.ExternalInterface.addCallback("__set_bt", this.js_call_set_bt);
             
@@ -229,7 +229,7 @@ package
          *       use metadata width if 0.
          *       use user specified width if -1.
          */
-        private function js_call_dar(num:int, den:int):void {
+        private function js_call_set_dar(num:int, den:int):void {
             user_dar_num = num;
             user_dar_den = den;
             
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index b587720f8..6bdcabcc7 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -80,16 +80,22 @@
                 remote_player = new SrsPlayer("remote_player", 430, 185);
                 remote_player.on_player_ready = function() {
                     this.set_bt(0.8);
-                    this.set_fs("screen", 100);
                 };
+                remote_player.on_player_metadata = function(metadata) {
+                    this.set_dar(0, 0);
+                    this.set_fs("screen", 100);
+                }
                 remote_player.start();
                 
                 // start the realtime player.
                 realtime_player = new SrsPlayer("realtime_player", 430, 185);
                 realtime_player.on_player_ready = function() {
                     this.set_bt(0.8);
-                    this.set_fs("screen", 100);
                 };
+                realtime_player.on_player_metadata = function(metadata) {
+                    this.set_dar(0, 0);
+                    this.set_fs("screen", 100);
+                }
                 realtime_player.start();
             }
         });

From 70dc3dbb53809daa1015e3ed01b08a83c2df7430 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 17:26:50 +0800
Subject: [PATCH 11/30] layout the chat in 2x8 table

---
 trunk/research/players/js/srs.page.js      |   8 +-
 trunk/research/players/js/srs.publisher.js |  14 ++
 trunk/research/players/srs_chat.html       | 224 +++++++++++++--------
 3 files changed, 162 insertions(+), 84 deletions(-)
 mode change 100644 => 100755 trunk/research/players/js/srs.page.js

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
old mode 100644
new mode 100755
index fff3ccb97..e68ee30f9
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -286,19 +286,19 @@ function srs_chat_initialize_page(
     
     //var gops = ["0.3", "0.5", "1", "2", "3", "4", 
     //    "5", "6", "7", "8", "9", "10", "15", "20"];
-    $(sl_gop + " option[value='0.5']").attr("selected", true);
+    $(sl_gop + " option[value='1']").attr("selected", true);
     
     //var sizes = ["176x144", "320x240", "352x240", 
     //    "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
     //    "1024x768", "1280x720", "1360x768", "1920x1080"];
-    $(sl_size + " option[value='320x240']").attr("selected", true);
+    $(sl_size + " option[value='640x480']").attr("selected", true);
     
     //var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
-    $(sl_fps + " option[value='10']").attr("selected", true);
+    $(sl_fps + " option[value='15']").attr("selected", true);
     
     //var bitrates = ["50", "200", "350", "500", "650", "800", 
     //    "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
-    $(sl_bitrate + " option[value='200']").attr("selected", true);
+    $(sl_bitrate + " option[value='350']").attr("selected", true);
 }
 /**
 * get the vcodec and acodec.
diff --git a/trunk/research/players/js/srs.publisher.js b/trunk/research/players/js/srs.publisher.js
index b46d51ef7..3dac341ec 100755
--- a/trunk/research/players/js/srs.publisher.js
+++ b/trunk/research/players/js/srs.publisher.js
@@ -87,6 +87,9 @@ SrsPublisher.prototype.start = function() {
 * @param acodec an object contains the audio codec info.
 */
 SrsPublisher.prototype.publish = function(url, vcodec, acodec) {
+    this.stop();
+    SrsPublisher.__publishers.push(this);
+    
     if (url) {
         this.url = url;
     }
@@ -100,6 +103,17 @@ SrsPublisher.prototype.publish = function(url, vcodec, acodec) {
     this.callbackObj.ref.__publish(this.url, this.width, this.height, this.vcodec, this.acodec);
 }
 SrsPublisher.prototype.stop = function() {
+    for (var i = 0; i < SrsPublisher.__publishers.length; i++) {
+        var player = SrsPublisher.__publishers[i];
+        
+        if (player.id != this.id) {
+            continue;
+        }
+        
+        SrsPublisher.__publishers.splice(i, 1);
+        break;
+    }
+    
     this.callbackObj.ref.__stop();
 }
 /**
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 270322d91..f895c4e5d 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -86,6 +86,16 @@
                 realtime_player.start();
             }
             
+            // 2x8 users
+            for (var i = 0; i < 8; i++) {
+                var tr = $("<tr></tr>").hide();
+                $("#lst_chats").append(tr);
+                
+                for (var j = 0; j < 2; j++) {
+                    tr.append($("<td></td>").attr("id", "td_" + (i * 8 + j)));
+                }
+            }
+            
             api_server = "http://" + query.hostname + ":" + srs_get_api_server_port() + "/api/v1/chats";
             refresh();
         });
@@ -187,89 +197,44 @@
                 }
             });
         }
-        function render_chat_room(chats) {
+        function render_chat_room(original_chats) {
             if (!self_chat) {
                 return;
             }
             
+            var chats = [];
+            for (var i = 0; i < original_chats.length; i++) {
+                var chat = original_chats[i];
+                
+                // ignore the self.
+                if (self_chat && self_chat.id == chat.id) {
+                    continue;
+                }
+                
+                chats.push(chat);
+            }
+            
             // new added chat
             for (var i = 0; i < chats.length; i++) {
                 var chat = chats[i];
-                // ignore the self.
-                if (self_chat && self_chat.id == chat.id) {
-                    continue;
-                }
                 
                 // if previous exists, ignore, only add new here.
                 var previous_chat = get_previous_chat_user(previous_chats, chat.id);
                 if (previous_chat) {
                     // update reference.
+                    chat.ui = previous_chat.ui;
+                    chat.parent = previous_chat.parent;
                     chat.player = previous_chat.player;
-                    chat.player.private_object = chat;
+                    if (chat.player) {
+                        chat.player.private_object = chat;
+                    }
                     continue;
                 }
-                
-                global_chat_user_id++;
-                
-                // username: a str indicates the user name.
-                // url: a str indicates the url of user stream.
-                // join_date: a str indicates the join timestamp in seconds.
-                // join_date_str: friendly formated time.
-                var obj = $("<div/>").html($("#template").html());
-                $(obj).attr("chat_id", chat.id);
-                $(obj).attr("id", "div_" + chat.id); // for specifed chat: $("#div_" + chat_id)
-                $(obj).attr("class", "div_chat"); // for all chats: $(".div_chat")
-                $(obj).find("#chat_player").attr("id", "rp_" + chat.id); // for specifed player: $("#rp_" + chat_id)
-                $(obj).find("#chat_player_raw").attr("id", "rp_raw_" + chat.id); // for specifed player: $("#rp_raw_" + chat_id)
-                $(obj).find("#user_name").text(chat.username);
-                $(obj).find("#join_date").text(chat.join_date_str);
-                $(obj).find("#collapseM").attr("id", "collapse_" + global_chat_user_id);
-                $(obj).find("#headerN").attr("href", "#collapse_" + global_chat_user_id);
-                
-                $("#lst_chats").append(obj);
-            
-                if (!no_play) {
-                    // start the realtime player.
-                    var _player = new SrsPlayer("rp_raw_" + chat.id, 600, 300, chat);
-                    _player.on_player_ready = function() {
-                        this.set_bt(0.5);
-                    };
-                    _player.on_player_metadata = function(metadata) {
-                        this.set_dar(0, 0);
-                        this.set_fs("screen", 100);
-                    }
-                    _player.start(chat.url);
-                    
-                    chat.player = _player;
-                } else {
-                    chat.player = null;
-                }
-                
-                $(obj).find("#collapse_main").on('hidden', function(){
-                    var id = $(this).parent().attr("chat_id");
-                    var chat = get_previous_chat_user(previous_chats, id);
-                    if (!chat || !chat.player) {
-                        return;
-                    }
-                    chat.player.stop();
-                });
-                $(obj).find("#collapse_main").on('shown', function(){
-                    var id = $(this).parent().attr("chat_id");
-                    var chat = get_previous_chat_user(previous_chats, id);
-                    if (!chat || !chat.player) {
-                        return;
-                    }
-                    chat.player.play();
-                });
             }
             
             // removed chat
             for (var i = 0; i < previous_chats.length; i++) {
                 var chat = previous_chats[i];
-                // ignore the self.
-                if (self_chat && self_chat.id == chat.id) {
-                    continue;
-                }
                 
                 var new_chat = get_previous_chat_user(chats, chat.id);
                 if (new_chat) {
@@ -282,6 +247,117 @@
                 $("#div_" + chat.id).remove();
             }
             
+            // hide empty rows.
+            $("#lst_chats").find("tr").each(function(){
+                var empty = true;
+                
+                $(this).find("td").each(function(){
+                    if ($(this).html() != "") {
+                        empty = false;
+                        return false; // abort each
+                    }
+                    return true;
+                });
+                
+                if (empty) {
+                    $(this).hide();
+                }
+            });
+            
+            // render the chat
+            for (var i = 0; i < chats.length; i++) {
+                var chat = chats[i];
+                
+                // if redered, ignore.
+                if (chat.parent) {
+                    continue;
+                }
+                
+                // generate the ui of chat
+                if (!chat.ui) {
+                    global_chat_user_id++;
+                    
+                    // username: a str indicates the user name.
+                    // url: a str indicates the url of user stream.
+                    // join_date: a str indicates the join timestamp in seconds.
+                    // join_date_str: friendly formated time.
+                    var obj = $("<div/>").html($("#template").html());
+                    if (true) {
+                        // save current ui object to the chat.
+                        chat.ui = obj;
+                        
+                        $(obj).attr("chat_id", chat.id);
+                        $(obj).attr("id", "div_" + chat.id); // for specifed chat: $("#div_" + chat_id)
+                        $(obj).attr("class", "div_chat"); // for all chats: $(".div_chat")
+                        $(obj).find("#chat_player").attr("id", "rp_" + chat.id); // for specifed player: $("#rp_" + chat_id)
+                        $(obj).find("#chat_player_raw").attr("id", "rp_raw_" + chat.id); // for specifed player: $("#rp_raw_" + chat_id)
+                        $(obj).find("#user_name").text(chat.username);
+                        $(obj).find("#join_date").text(chat.join_date_str);
+                        $(obj).find("#collapseM").attr("id", "collapse_" + global_chat_user_id);
+                        $(obj).find("#headerN").attr("href", "#collapse_" + global_chat_user_id);
+                    }
+                }
+                
+                // find a idle td to render the chat.
+                var parent = null;
+                $("#lst_chats").find("td").each(function(){
+                    if ($(this).html() != "") {
+                        return true;
+                    }
+                    
+                    parent = $(this);
+                    return false; // abort each
+                });
+                
+                if (!parent) {
+                    warn("没有可用的位置展示流。");
+                    break;
+                }
+                $(parent).append(chat.ui);
+                $(parent).parent().show();
+                
+                // when ui elements appent to the page,
+                // create the player, or flash will failed.
+                if (!chat.parent) {
+                    chat.parent = $(parent);
+                    
+                    if (!no_play) {
+                        // start the realtime player.
+                        var _player = new SrsPlayer("rp_raw_" + chat.id, 430, 185, chat);
+                        _player.on_player_ready = function() {
+                            this.set_bt(0.5);
+                            this.play();
+                        };
+                        _player.on_player_metadata = function(metadata) {
+                            this.set_dar(0, 0);
+                            this.set_fs("screen", 100);
+                        }
+                        _player.start(chat.url);
+                        
+                        chat.player = _player;
+                    } else {
+                        chat.player = null;
+                    }
+                    
+                    $(obj).find("#collapse_main").on('hidden', function(){
+                        var id = $(this).parent().attr("chat_id");
+                        var chat = get_previous_chat_user(previous_chats, id);
+                        if (!chat || !chat.player) {
+                            return;
+                        }
+                        chat.player.stop();
+                    });
+                    $(obj).find("#collapse_main").on('shown', function(){
+                        var id = $(this).parent().attr("chat_id");
+                        var chat = get_previous_chat_user(previous_chats, id);
+                        if (!chat || !chat.player) {
+                            return;
+                        }
+                        chat.player.play();
+                    });
+                }
+            }
+            
             previous_chats = chats;
         }
         function get_previous_chat_user(arr, id) {
@@ -325,10 +401,6 @@
             // removed chat
             for (var i = 0; i < previous_chats.length; i++) {
                 var chat = previous_chats[i];
-                // ignore the self.
-                if (self_chat && self_chat.id == chat.id) {
-                    continue;
-                }
                 
                 if (chat.player) {
                     chat.player.stop();
@@ -517,26 +589,18 @@
                     <img src="img/tooltip.png"/>
                 </span>
             </div>
-            <div id="collapseM" class="accordion-body collapse">
+            <div id="collapseM" class="accordion-body collapse in">
                 <div class="accordion-inner">
-                    <div class="row-fluid">
-                        <div class="span2">
-                        </div>
-                        <div class="span8">
-                            <div id="chat_player">
-                                <div id="chat_player_raw">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="span2">
+                    <div id="chat_player">
+                        <div id="chat_player_raw">
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <div class="container" id="lst_chats">
-    </div>
+    <table id="lst_chats" class="table">
+    </table>
     <div id="video_modal" class="modal hide fade">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

From 962deefb92aaf346cd7de8cd6c006ee7f407b4b4 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 17:41:41 +0800
Subject: [PATCH 12/30] refine the ui of chat.

---
 trunk/research/players/srs_chat.html | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index f895c4e5d..4e1a9c7de 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -95,6 +95,8 @@
                     tr.append($("<td></td>").attr("id", "td_" + (i * 8 + j)));
                 }
             }
+            // remove border of row.
+            $("#lst_chats").find("td").css("border", "none");
             
             api_server = "http://" + query.hostname + ":" + srs_get_api_server_port() + "/api/v1/chats";
             refresh();
@@ -545,9 +547,9 @@
             <input type="text" id="txt_url" class="input-mini hide" value=""></input>
         </div>
     </div>
-    <div class="container">
-        <div class="row-fluid">
-            <div class="span6">
+    <table id="lst_chats" class="table">
+        <tr>
+            <td>
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <span class="accordion-toggle">
@@ -560,8 +562,8 @@
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="span6">
+            </td>
+            <td>
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <span class="accordion-toggle">
@@ -577,9 +579,9 @@
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
-    </div>
+            </td>
+        </tr>
+    </table>
     <div class="container hide" id="template">
         <div class="accordion-group" id="collapse_main">
             <div class="accordion-heading" title="点击展开或收起，收起后停止播放流，展开时从服务器请求流">
@@ -599,7 +601,7 @@
             </div>
         </div>
     </div>
-    <table id="lst_chats" class="table">
+    <table class="table">
     </table>
     <div id="video_modal" class="modal hide fade">
         <div class="modal-header">

From b1fe298def942ce0b5c22ef6930e849b1151e68c Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 18:17:44 +0800
Subject: [PATCH 13/30] change ui version to 1.13

---
 trunk/research/players/js/srs.page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index e68ee30f9..93d9fce83 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -10,7 +10,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
 // to query the swf anti cache.
-function srs_get_version_code() { return "1.11"; }
+function srs_get_version_code() { return "1.13"; }
 // get the default vhost for players.
 function srs_get_player_vhost() { return "players"; }
 // the api server port, for chat room.

From 1dedc1cf804e7ed01ddb765b4c897396328c8062 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 18:29:15 +0800
Subject: [PATCH 14/30] v0.9 release

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 68690bd5e..f685c1cf2 100755
--- a/README.md
+++ b/README.md
@@ -253,6 +253,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 </pre>
 
 ### Releases
+* 2013-12-08, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demo pages. 20926 lines.<br/>
 * 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update st-load. 19186 lines.<br/>
 * 2013-12-03, [release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support live stream transcoding. 17605 lines.<br/>
 * 2013-11-29, [release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support forward stream to origin/edge. 16094 lines.<br/>
@@ -264,6 +265,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 * 2013-10-17, created.<br/>
 
 ### Compare
+* srs v0.9: 20926 lines. player/encoder/chat demos. bandwidth test for encoder/CDN.<br/>
 * srs v0.8: 19186 lines. implements http hooks refer to [nginx-rtmp](https://github.com/arut/nginx-rtmp-module). <br/>
 * srs v0.7: 17605 lines. implements transcoding(FFMPEG) feature refer to [wowza](http://www.wowza.com). <br/>
 * srs v0.6: 16094 lines. important feature forward for CDN. <br/>
@@ -276,6 +278,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 * nginx v1.5.0: 139524 lines <br/>
 
 ### History
+* v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines.
 * v0.9, 2013-12-25, fix the bitrate bug(in Bps), use enhanced microphone.
 * v0.9, 2013-12-22, demo video meeting or chat(srs+cherrypy+jquery+bootstrap).
 * v0.9, 2013-12-22, merge from wenjie, support banwidth test.

From 29b01dd6896446b6f4220e91d8839bf9eda68501 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 18:29:53 +0800
Subject: [PATCH 15/30] v0.9 release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f685c1cf2..7f64edca7 100755
--- a/README.md
+++ b/README.md
@@ -253,7 +253,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 </pre>
 
 ### Releases
-* 2013-12-08, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demo pages. 20926 lines.<br/>
+* 2013-12-08, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demos. 20926 lines.<br/>
 * 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update st-load. 19186 lines.<br/>
 * 2013-12-03, [release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support live stream transcoding. 17605 lines.<br/>
 * 2013-11-29, [release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support forward stream to origin/edge. 16094 lines.<br/>

From a29f8dff27582301f5dea2bb01552ab9c670c006 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 18:33:18 +0800
Subject: [PATCH 16/30] v0.9 release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f64edca7..6212810ba 100755
--- a/README.md
+++ b/README.md
@@ -253,7 +253,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 </pre>
 
 ### Releases
-* 2013-12-08, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demos. 20926 lines.<br/>
+* 2013-12-25, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demos. 20926 lines.<br/>
 * 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update st-load. 19186 lines.<br/>
 * 2013-12-03, [release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support live stream transcoding. 17605 lines.<br/>
 * 2013-11-29, [release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support forward stream to origin/edge. 16094 lines.<br/>

From 7ed8cc2b947cc5a51af0342fc199bfda350e9432 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 18:34:24 +0800
Subject: [PATCH 17/30] v0.9 release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6212810ba..b0bb23c7d 100755
--- a/README.md
+++ b/README.md
@@ -254,7 +254,7 @@ usr sys idl wai hiq siq| read  writ| recv  send|  in   out | int   csw
 
 ### Releases
 * 2013-12-25, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demos. 20926 lines.<br/>
-* 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update st-load. 19186 lines.<br/>
+* 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update [st_load](https://github.com/winlinvip/st-load). 19186 lines.<br/>
 * 2013-12-03, [release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support live stream transcoding. 17605 lines.<br/>
 * 2013-11-29, [release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support forward stream to origin/edge. 16094 lines.<br/>
 * 2013-11-26, [release v0.5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.5), support HLS(m3u8), fragment and window. 14449 lines.<br/>

From ec5e33f3bc4edd66b85f8fb17e83315a6f9bf195 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 22:01:59 +0800
Subject: [PATCH 18/30] refine the filter of camera and microphone

---
 trunk/research/players/js/srs.page.js | 48 ++++++++++++++++++++-------
 trunk/research/players/srs_chat.html  |  4 +--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 93d9fce83..2463fd3fd 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -148,17 +148,29 @@ function srs_initialize_codec_page(
     for (var i = 0; i < cameras.length; i++) {
         $(sl_cameras).append("<option value='" + i + "'>" + cameras[i] + "</option");
     }
-    // optional: select the first no "virtual" signed.
+    // optional: select the except matches
+    matchs = ["virtual"];
     for (var i = 0; i < cameras.length; i++) {
-        if (cameras[i].toLowerCase().indexOf("virtual") == -1) {
-            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (cameras[i].toLowerCase().indexOf(matchs[j]) == -1) {
+                $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
-    // optional: select the first "integrated" signed.
+    // optional: select the first matched.
+    matchs = ["turevision", "integrated"];
     for (var i = 0; i < cameras.length; i++) {
-        if (cameras[i].toLowerCase().indexOf("integrated") >= 0) {
-            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (cameras[i].toLowerCase().indexOf(matchs[j]) >= 0) {
+                $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
@@ -167,17 +179,29 @@ function srs_initialize_codec_page(
     for (var i = 0; i < microphones.length; i++) {
         $(sl_microphones).append("<option value='" + i + "'>" + microphones[i] + "</option");
     }
-    // optional: select the first no "default" signed.
+    // optional: select the except matches
+    matchs = ["default"];
     for (var i = 0; i < microphones.length; i++) {
-        if (microphones[i].toLowerCase().indexOf("default") == -1) {
-            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (microphones[i].toLowerCase().indexOf(matchs[j]) == -1) {
+                $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
-    // optional: select the first "realtek" signed.
+    // optional: select the first matched.
+    matchs = ["realtek", "内置式麦克风"];
     for (var i = 0; i < microphones.length; i++) {
-        if (microphones[i].toLowerCase().indexOf("realtek") >= 0) {
-            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (microphones[i].toLowerCase().indexOf(matchs[j]) >= 0) {
+                $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 4e1a9c7de..7e2a513d3 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -373,7 +373,7 @@
         }
         
         function on_user_publish() {
-            if ($("#txt_name").val().trim() == "") {
+            if ($("#txt_name").val() == "") {
                 $("#txt_name").focus().parent().parent().addClass("error");
                 warn(100, "请输入您的名字");
                 return;
@@ -460,7 +460,7 @@
             
             var chat = {};
             chat.id = -1;
-            chat.username = $("#txt_name").val().trim();
+            chat.username = $("#txt_name").val();
             chat.agent = navigator.userAgent;
             chat.url = url;
             chat.vcodec = vcodec;

From 7b2f9d59a21ae37cfab53430837cc620196a6a1e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 22:18:05 +0800
Subject: [PATCH 19/30] fix bug of identify the truevision camera

---
 trunk/research/players/js/srs.page.js | 2 +-
 trunk/research/players/srs_chat.html  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 2463fd3fd..322286eae 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -162,7 +162,7 @@ function srs_initialize_codec_page(
         }
     }
     // optional: select the first matched.
-    matchs = ["turevision", "integrated"];
+    matchs = ["truevision", "integrated"];
     for (var i = 0; i < cameras.length; i++) {
         for (var j = 0; j < matchs.length; j++) {
             if (cameras[i].toLowerCase().indexOf(matchs[j]) >= 0) {
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 7e2a513d3..63f786471 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -294,6 +294,7 @@
                         $(obj).find("#chat_player").attr("id", "rp_" + chat.id); // for specifed player: $("#rp_" + chat_id)
                         $(obj).find("#chat_player_raw").attr("id", "rp_raw_" + chat.id); // for specifed player: $("#rp_raw_" + chat_id)
                         $(obj).find("#user_name").text(chat.username);
+                        $(obj).find("#user_player_url").attr("href", chat.url);
                         $(obj).find("#join_date").text(chat.join_date_str);
                         $(obj).find("#collapseM").attr("id", "collapse_" + global_chat_user_id);
                         $(obj).find("#headerN").attr("href", "#collapse_" + global_chat_user_id);
@@ -588,7 +589,9 @@
                 <span id="headerN" class="accordion-toggle" data-toggle="collapse" href="#collapseN">
                     <strong>[<a href="#"><span id="user_name">XX</span></a>]</strong>
                     <strong>加入时间</strong>[<span id="join_date"></span>]
-                    <img src="img/tooltip.png"/>
+                    <a id="user_player_url" href="#" data-toggle="tooltip" data-placement="top" title="">
+                        播放地址<img src="img/tooltip.png"/>
+                    </a>
                 </span>
             </div>
             <div id="collapseM" class="accordion-body collapse in">

From 4b4f317e090f15f60aceaae0a2b7c0a7b28385f3 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 23:42:23 +0800
Subject: [PATCH 20/30] refine the ui, link the players to the api server
 static dir

---
 trunk/auto/depends.sh                         |   4 +
 trunk/research/api-server/server.py           |   6 +-
 trunk/research/players/js/json2.js            | 486 ++++++++++++++++++
 trunk/research/players/srs_chat.html          |  15 +-
 trunk/research/players/srs_player.html        |   1 +
 trunk/research/players/srs_publisher.html     |   1 +
 .../srs_publisher/release/srs_publisher.swf   | Bin 4742 -> 4757 bytes
 .../srs_publisher/src/srs_publisher.as        |   3 +
 trunk/scripts/dev.sh                          |  12 +-
 trunk/scripts/run.sh                          |   1 +
 10 files changed, 514 insertions(+), 15 deletions(-)
 create mode 100755 trunk/research/players/js/json2.js

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index dded4bba3..56f01dc1e 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -300,6 +300,10 @@ else
     echo "#undef SRS_HTTP" >> $SRS_AUTO_HEADERS_H
 fi
 
+echo "link players to cherrypy static-dir"
+rm -f research/api-server/static-dir/players &&
+ln -sf `pwd`/research/players research/api-server/static-dir/players
+
 #####################################################################################
 # openssl, for rtmp complex handshake
 #####################################################################################
diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py
index 99918cd87..01b7bf929 100755
--- a/trunk/research/api-server/server.py
+++ b/trunk/research/api-server/server.py
@@ -474,7 +474,8 @@ if len(sys.argv) <= 1:
 
 # parse port from user options.
 port = int(sys.argv[1])
-trace("api server listen at port: %s"%(port))
+static_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "static-dir"))
+trace("api server listen at port: %s, static_dir: %s"%(port, static_dir))
 
 # cherrypy config.
 conf = {
@@ -483,9 +484,12 @@ conf = {
         'server.socket_host': '0.0.0.0',
         'server.socket_port': port,
         'tools.encode.on': True,
+        'tools.staticdir.on': True,
         'tools.encode.encoding': "utf-8"
     },
     '/': {
+        'tools.staticdir.dir': static_dir,
+        'tools.staticdir.index': "index.html",
         # for cherrypy RESTful api support
         'request.dispatch': cherrypy.dispatch.MethodDispatcher()
     }
diff --git a/trunk/research/players/js/json2.js b/trunk/research/players/js/json2.js
new file mode 100755
index 000000000..d89ecc7a2
--- /dev/null
+++ b/trunk/research/players/js/json2.js
@@ -0,0 +1,486 @@
+/*
+    json2.js
+    2013-05-26
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+if (typeof JSON !== 'object') {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function () {
+
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function () {
+                return this.valueOf();
+            };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 63f786471..09839a09b 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -7,6 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
+    <script type="text/javascript" src="js/json2.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
     <script type="text/javascript" src="js/srs.player.js"></script>
@@ -82,6 +83,8 @@
                 realtime_player.on_player_metadata = function(metadata) {
                     this.set_dar(0, 0);
                     this.set_fs("screen", 100);
+                    
+                    info("推流到服务器成功。请戴耳机聊天，否则音箱的声音会进入麦克风造成回声。");
                 }
                 realtime_player.start();
             }
@@ -98,6 +101,8 @@
             // remove border of row.
             $("#lst_chats").find("td").css("border", "none");
             
+            $("#txt_name").focus();
+            
             api_server = "http://" + query.hostname + ":" + srs_get_api_server_port() + "/api/v1/chats";
             refresh();
         });
@@ -536,15 +541,15 @@
     <div class="alert alert-info fade in" id="txt_log">
         <button type="button" class="close" data-dismiss="alert">×</button>
         <strong><span id="txt_log_title">Usage:</span></strong>
-        <span id="txt_log_msg">输入名字，设置编码参数后，加入会议室</span>
+        <span id="txt_log_msg">输入名字，设点“加入会议”按钮</span>
     </div>
     
     <div class="control-group">
         <div class="form-inline">
-            <input type="text" id="txt_name" class="input-small" placeholder="您的名字..." value=""></input>
-            <button class="btn input-medium" id="btn_video_settings">视频编码配置</button>
-            <button class="btn input-medium" id="btn_audio_settings">音频编码配置</button>
-            <button class="btn input-medium btn-primary" id="btn_join">加入会议</button>
+            <button class="btn input-small" id="btn_video_settings">摄像头</button>
+            <button class="btn input-small" id="btn_audio_settings">麦克风</button>
+            <input type="text" id="txt_name" class="input-large" placeholder="请输入您的名字..." value=""></input>
+            <button class="btn input-small" id="btn_join">加入会议</button>
             <input type="text" id="txt_url" class="input-mini hide" value=""></input>
         </div>
     </div>
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 5ebc545fb..77afeb482 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -7,6 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
+    <script type="text/javascript" src="js/json2.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
     <script type="text/javascript" src="js/srs.player.js"></script>
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 6bdcabcc7..a40382c68 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -7,6 +7,7 @@
     <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
+    <script type="text/javascript" src="js/json2.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>
     <script type="text/javascript" src="js/srs.log.js"></script>
     <script type="text/javascript" src="js/srs.player.js"></script>
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index c4d2fd2fe6645b5cd1b52be5c726c071623a1da8..0c22b9c9561ddb1e6aea27567f4c67cbadc77811 100755
GIT binary patch
literal 4757
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

literal 4742
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
Ug=oHt5B{%UH~!H06Kcl9H9Wf|S^xk5

diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as
index 3a4458e5f..db889437a 100755
--- a/trunk/research/players/srs_publisher/src/srs_publisher.as
+++ b/trunk/research/players/srs_publisher/src/srs_publisher.as
@@ -243,10 +243,13 @@ package
          */
         private function js_call_stop():void {
             if (this.media_video) {
+                this.media_video.attachCamera(null);
                 this.removeChild(this.media_video);
                 this.media_video = null;
             }
             if (this.media_stream) {
+                this.media_stream.attachAudio(null);
+                this.media_stream.attachCamera(null);
                 this.media_stream.close();
                 this.media_stream = null;
             }
diff --git a/trunk/scripts/dev.sh b/trunk/scripts/dev.sh
index eb803e81a..fb39caecb 100755
--- a/trunk/scripts/dev.sh
+++ b/trunk/scripts/dev.sh
@@ -31,12 +31,6 @@ bash scripts/_step.start.api.server.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $
 
 # step 8: add server ip to client hosts as demo. 
 ip=`ifconfig|grep "inet"|grep "addr"|grep "Mask"|grep -v "127.0.0.1"|awk 'NR==1 {print $2}'|awk -F ':' '{print $2}'`
-echo -e "${GREEN}SRS系统开发环境启动成功${BLACK}"
-echo -e "${BLACK}播放器演示：${BLACK}"
-echo -e "${RED}    http://$ip/players/srs_player.html?vhost=players${BLACK}"
-echo -e "${BLACK}编码器演示：${BLACK}"
-echo -e "${RED}    http://$ip/players/srs_publisher.html?vhost=players${BLACK}"
-echo -e "${BLACK}视频会议演示：${BLACK}"
-echo -e "${RED}    http://$ip/players/srs_chat.html?vhost=players${BLACK}"
-echo -e "${BLACK}服务器测速演示：${BLACK}"
-echo -e "${RED}    http://$ip/players/srs_bwt.html?vhost=players${BLACK}"
+echo -e "${GREEN}SRS系统开发环境启动成功。演示：${BLACK}"
+echo -e "${RED}    http://$ip${BLACK}"
+echo -e "${RED}    http://$ip:8085/players/index.html${BLACK}"
diff --git a/trunk/scripts/run.sh b/trunk/scripts/run.sh
index 26685c3f7..afb10fe57 100755
--- a/trunk/scripts/run.sh
+++ b/trunk/scripts/run.sh
@@ -43,3 +43,4 @@ cat<<END
 END
 echo -e "${GREEN}演示地址：${BLACK}"
 echo -e "${RED}    http://$ip${BLACK}"
+echo -e "${RED}    http://$ip:8085${BLACK}"

From 531fa6fb762e052e9978646ceb945ade00eae085 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 08:56:13 +0800
Subject: [PATCH 21/30] change ui version to 1.15, fix the publiser bug,
 support chrome/firefox/safari/ie browsers.

---
 trunk/research/players/js/srs.log.js          |  19 ++++-
 trunk/research/players/js/srs.page.js         |  17 +++-
 trunk/research/players/js/srs.publisher.js    |   2 +
 trunk/research/players/js/srs.utility.js      |  51 ++++++++++++
 trunk/research/players/srs_chat.html          |  27 +++++-
 trunk/research/players/srs_publisher.html     |  27 +++++-
 .../srs_publisher/release/srs_publisher.swf   | Bin 4757 -> 5201 bytes
 .../srs_publisher/src/srs_publisher.as        |  78 ++++++++++++++----
 8 files changed, 198 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 trunk/research/players/js/srs.log.js
 mode change 100644 => 100755 trunk/research/players/js/srs.utility.js

diff --git a/trunk/research/players/js/srs.log.js b/trunk/research/players/js/srs.log.js
old mode 100644
new mode 100755
index c3ffde5f5..eb7d27d3b
--- a/trunk/research/players/js/srs.log.js
+++ b/trunk/research/players/js/srs.log.js
@@ -7,18 +7,31 @@
         <span id="txt_log_msg">日志内容</span>
     </div>
 */
+var srs_log_disabled = false;
 function info(desc) {
+    if (srs_log_disabled) {
+        return;
+    }
+    
     $("#txt_log").addClass("alert-info").removeClass("alert-error").removeClass("alert-warn");
     $("#txt_log_title").text("Info:");
-    $("#txt_log_msg").text(desc);
+    $("#txt_log_msg").html(desc);
 }
 function warn(code, desc) {
+    if (srs_log_disabled) {
+        return;
+    }
+    
     $("#txt_log").removeClass("alert-info").removeClass("alert-error").addClass("alert-warn");
     $("#txt_log_title").text("Warn:");
-    $("#txt_log_msg").text("code: " + code + ", " + desc);
+    $("#txt_log_msg").html("code: " + code + ", " + desc);
 }
 function error(code, desc) {
+    if (srs_log_disabled) {
+        return;
+    }
+    
     $("#txt_log").removeClass("alert-info").addClass("alert-error").removeClass("alert-warn");
     $("#txt_log_title").text("Error:");
-    $("#txt_log_msg").text("code: " + code + ", " + desc);
+    $("#txt_log_msg").html("code: " + code + ", " + desc);
 }
diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 322286eae..165b8d8b7 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -10,7 +10,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
 // to query the swf anti cache.
-function srs_get_version_code() { return "1.13"; }
+function srs_get_version_code() { return "1.15"; }
 // get the default vhost for players.
 function srs_get_player_vhost() { return "players"; }
 // the api server port, for chat room.
@@ -139,6 +139,21 @@ function srs_init_publish(rtmp_url) {
     }
 }
 
+// check whether can republish
+function srs_can_republish() {
+    var browser = get_browser_agents();
+    
+    if (browser.Chrome || browser.Firefox) {
+        return true;
+    }
+    
+    if (browser.MSIE || browser.QQBrowser) {
+        return false;
+    }
+    
+    return false;
+}
+
 // without default values set.
 function srs_initialize_codec_page(
     cameras, microphones,
diff --git a/trunk/research/players/js/srs.publisher.js b/trunk/research/players/js/srs.publisher.js
index 3dac341ec..50363e7d5 100755
--- a/trunk/research/players/js/srs.publisher.js
+++ b/trunk/research/players/js/srs.publisher.js
@@ -54,6 +54,8 @@ SrsPublisher.prototype.start = function() {
     // embed the flash.
     var flashvars = {};
     flashvars.id = this.id;
+    flashvars.width = this.width;
+    flashvars.height = this.height;
     flashvars.on_publisher_ready = "__srs_on_publisher_ready";
     flashvars.on_publisher_error = "__srs_on_publisher_error";
     flashvars.on_publisher_warn = "__srs_on_publisher_warn";
diff --git a/trunk/research/players/js/srs.utility.js b/trunk/research/players/js/srs.utility.js
old mode 100644
new mode 100755
index 19b715859..1f2bb1eeb
--- a/trunk/research/players/js/srs.utility.js
+++ b/trunk/research/players/js/srs.utility.js
@@ -81,3 +81,54 @@ function srs_parse_rtmp_url(rtmp_url) {
     
     return ret;
 }
+
+/**
+* get the agent.
+* @return an object specifies some browser.
+*   for example, get_browser_agents().MSIE
+*/
+function get_browser_agents() {
+    var agent = navigator.userAgent;
+    
+    /**
+    WindowsPC platform, Win7:
+        chrome 31.0.1650.63:
+            Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 
+            (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36
+        firefox 23.0.1:
+            Mozilla/5.0 (Windows NT 6.1; WOW64; rv:23.0) Gecko/20100101 
+            Firefox/23.0
+        safari 5.1.7(7534.57.2):
+            Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.57.2 
+            (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2
+        opera 15.0.1147.153:
+            Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 
+            (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36 
+            OPR/15.0.1147.153
+        360 6.2.1.272: 
+            Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; 
+            Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; 
+            .NET CLR 3.0.30729; Media Center PC 6.0; InfoPath.2; .NET4.0C; 
+            .NET4.0E)
+        IE 10.0.9200.16750(update: 10.0.12):
+            Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; 
+            Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; 
+            .NET CLR 3.0.30729; Media Center PC 6.0; InfoPath.2; .NET4.0C; 
+            .NET4.0E)
+    */
+    
+    return {
+        // platform
+        Android: agent.indexOf("Android") != -1,
+        Windows: agent.indexOf("Windows") != -1,
+        iPhone: agent.indexOf("iPhone") != -1,
+        // Windows Browsers
+        Chrome: agent.indexOf("Chrome") != -1,
+        Firefox: agent.indexOf("Firefox") != -1,
+        QQBrowser: agent.indexOf("QQBrowser") != -1,
+        MSIE: agent.indexOf("MSIE") != -1, 
+        // Android Browsers
+        Opera: agent.indexOf("Presto") != -1,
+        MQQBrowser: agent.indexOf("MQQBrowser") != -1
+    };
+}
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 09839a09b..804f7efa5 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -27,18 +27,23 @@
         var previous_chats = [];
         var no_play = false;
         
+        var query = parse_query_string();
         $(function(){
             // get the vhost and port to set the default url.
             // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
             // url set to: rtmp://demo:1935/live/livestream
             srs_init_publish("#txt_url");
             
+            if (query.agent == "true") {
+                document.write(navigator.userAgent);
+                return;
+            }
+            
             $("#realtime_player_url").tooltip({
                 title: "右键复制RTMP地址"
             });
             
             // if no play specified, donot show the player, for debug the publisher.
-            var query = parse_query_string();
             if (query.no_play == "true") {
                 no_play = true;
             }
@@ -65,6 +70,10 @@
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
+                if (!on_publish_stop()) {
+                    return;
+                }
+                
                 error(code, desc + "请重试。");
             };
             srs_publisher.on_publisher_warn = function(code, desc) {
@@ -107,6 +116,18 @@
             refresh();
         });
         
+        function on_publish_stop() {
+            if (!srs_can_republish()) {
+                $("#btn_join").attr("disabled", true);
+                error(0, "您使用的浏览器很弱，请关闭页面后重新打开页面（刷新也不管用）。<br/>推荐使用Chrome/Firefox/Safari/Opera浏览器，支持重试");
+                
+                srs_log_disabled = true;
+                return false;
+            }
+            
+            return true;
+        }
+        
         function update_play_url() {
             var url = $("#txt_url").val();
             
@@ -432,6 +453,10 @@
                 data       : "",
                 dataType   : "json",
                 complete   : function() {
+                    if (!on_publish_stop()) {
+                        return;
+                    }
+            
                     $("#btn_join").attr("disabled", false);
                     if (complete_pfn) {
                         complete_pfn();
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index a40382c68..3f90e8983 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -23,12 +23,18 @@
         var remote_player = null;
         var realtime_player = null;
         
+        var query = parse_query_string();
         $(function(){
             // get the vhost and port to set the default url.
             // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo
             // url set to: rtmp://demo:1935/live/livestream
             srs_init("#txt_url", null, null);
             
+            if (query.agent == "true") {
+                document.write(navigator.userAgent);
+                return;
+            }
+            
             $("#btn_video_settings").click(function(){
                 $("#video_modal").modal({show:true});
             });
@@ -65,6 +71,9 @@
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
+                if (!on_publish_stop()) {
+                    return;
+                }
                 error(code, desc + "请重试。");
             };
             srs_publisher.on_publisher_warn = function(code, desc) {
@@ -75,7 +84,6 @@
             update_play_url();
             
             // if no play specified, donot show the player, for debug the publisher.
-            var query = parse_query_string();
             if (query.no_play != "true") {
                 // start the normal player with HLS supported.
                 remote_player = new SrsPlayer("remote_player", 430, 185);
@@ -101,6 +109,18 @@
             }
         });
         
+        function on_publish_stop() {
+            if (!srs_can_republish()) {
+                $("#btn_join").attr("disabled", true);
+                error(0, "您使用的浏览器很弱，请关闭页面后重新打开页面（刷新也不管用）。<br/>推荐使用Chrome/Firefox/Safari/Opera浏览器，支持重试");
+                
+                srs_log_disabled = true;
+                return false;
+            }
+            
+            return true;
+        }
+        
         /**
         * we generate the transcoded stream url for flash publish donot support HLS
         * which requires aac, so the publish vhost maybe players for example, we
@@ -112,7 +132,6 @@
         function update_play_url() {
             var url = $("#txt_url").val();
             var ret = srs_parse_rtmp_url(url);
-            var query = parse_query_string();
             
             var remote_url = "rtmp://" + ret.server + ":" + ret.port + "/" + ret.app + "...vhost..." + srs_get_player_publish_vhost(ret.vhost) + "/" + ret.stream;
             $("#realtime_player_url").attr("href", url).attr("target", "_blank");
@@ -147,6 +166,10 @@
                 //$("#remote_player_url").attr("href", "#").attr("target", "_self");
                 //$("#txt_play_hls").text("HLS-m3u8(请发布视频)").attr("href", "#").attr("target", "_self");
                 //$("#txt_play_jwplayer").text("HLS-JWPlayer(请发布视频)").attr("href", "#").attr("target", "_self");
+                
+                if (!on_publish_stop()) {
+                    return;
+                }
                 return;
             }
             
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index 0c22b9c9561ddb1e6aea27567f4c67cbadc77811..c7c7b58050120f73b6ef8a14cdc67e9a54d08d50 100755
GIT binary patch
literal 5201
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
L{4MdXL7vvI8CWA8

literal 4757
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

diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as
index db889437a..d9141b4ce 100755
--- a/trunk/research/players/srs_publisher/src/srs_publisher.as
+++ b/trunk/research/players/srs_publisher/src/srs_publisher.as
@@ -16,6 +16,8 @@ package
     import flash.media.Video;
     import flash.net.NetConnection;
     import flash.net.NetStream;
+    import flash.system.Security;
+    import flash.system.SecurityPanel;
     import flash.ui.ContextMenu;
     import flash.ui.ContextMenuItem;
     import flash.utils.setTimeout;
@@ -84,6 +86,18 @@ package
             this.js_on_publisher_error = flashvars.on_publisher_error;
             this.js_on_publisher_warn = flashvars.on_publisher_warn;
             
+            // initialized size.
+            this.user_w = flashvars.width;
+            this.user_h = flashvars.height;
+            
+            // try to get the camera, if muted, alert the security and requires user to open it.
+            var c:Camera = Camera.getCamera();
+            if (c.muted) {
+                Security.showSettings(SecurityPanel.PRIVACY);
+            }
+            
+            __show_local_camera(c);
+            
             flash.utils.setTimeout(this.system_on_js_ready, 0);
         }
         
@@ -221,17 +235,7 @@ package
                 var streamName:String = url.substr(url.lastIndexOf("/"));
                 media_stream.publish(streamName);
                 
-                media_video = new Video();
-                media_video.width = _width;
-                media_video.height = _height;
-                media_video.attachCamera(media_camera);
-                media_video.smoothing = true;
-                addChild(media_video);
-                
-                //__draw_black_background(_width, _height);
-                
-                // lowest layer, for mask to cover it.
-                setChildIndex(media_video, 0);
+                __show_local_camera(media_camera);
             });
             
             var tcUrl:String = this.user_url.substr(0, this.user_url.lastIndexOf("/"));
@@ -242,11 +246,6 @@ package
          * function for js to call: to stop the stream. ignore if not publish.
          */
         private function js_call_stop():void {
-            if (this.media_video) {
-                this.media_video.attachCamera(null);
-                this.removeChild(this.media_video);
-                this.media_video = null;
-            }
             if (this.media_stream) {
                 this.media_stream.attachAudio(null);
                 this.media_stream.attachCamera(null);
@@ -363,5 +362,52 @@ package
             //		quality=1 is lowest quality, 100 is highest quality.
             c.setQuality(cameraBitrate / 8.0 * 1000, cameraQuality);
         }
+        
+        private function __show_local_camera(c:Camera):void {
+            if (this.media_video) {
+                this.media_video.attachCamera(null);
+                this.removeChild(this.media_video);
+                this.media_video = null;
+            }
+            
+            // show local camera
+            media_video = new Video();
+            media_video.attachCamera(c);
+            media_video.smoothing = true;
+            addChild(media_video);
+            
+            // rescale the local camera.
+            var cw:Number = user_h * c.width / c.height;
+            if (cw > user_w) {
+                var ch:Number = user_w * c.height / c.width;
+                media_video.width = user_w;
+                media_video.height = ch;
+            } else {
+                media_video.width = cw;
+                media_video.height = user_h;
+            }
+            media_video.x = (user_w - media_video.width) / 2;
+            media_video.y = (user_h - media_video.height) / 2;
+            
+            __draw_black_background(user_w, user_h);
+            
+            // lowest layer, for mask to cover it.
+            setChildIndex(media_video, 0);
+        }
+        
+        /**
+         * draw black background and draw the fullscreen mask.
+         */
+        private function __draw_black_background(_width:int, _height:int):void {
+            // draw black bg.
+            this.graphics.beginFill(0x00, 1.0);
+            this.graphics.drawRect(0, 0, _width, _height);
+            this.graphics.endFill();
+            
+            // draw the fs mask.
+            //this.control_fs_mask.graphics.beginFill(0xff0000, 0);
+            //this.control_fs_mask.graphics.drawRect(0, 0, _width, _height);
+            //this.control_fs_mask.graphics.endFill();
+        }
     }
 }
\ No newline at end of file

From 7094b6f43737d5258d1633a392658552d08b093f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 09:02:16 +0800
Subject: [PATCH 22/30] set default to chat.

---
 .../research/api-server/static-dir/index.html | 50 +++++++++++++++++++
 trunk/research/players/index.html             |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100755 trunk/research/api-server/static-dir/index.html

diff --git a/trunk/research/api-server/static-dir/index.html b/trunk/research/api-server/static-dir/index.html
new file mode 100755
index 000000000..0b1ff9823
--- /dev/null
+++ b/trunk/research/api-server/static-dir/index.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SRS</title>   
+    <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="players/css/bootstrap.min.css"/>
+    <script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="players/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="players/js/swfobject.js"></script>
+    <script type="text/javascript" src="players/js/srs.page.js"></script>
+    <style>
+        body{
+            padding-top: 55px;
+        }
+    </style>
+    <script type="text/javascript">
+        $(function(){
+            update_nav();
+            
+            // direct to the default vhost for players.
+            window.location.href = "players/index.html";
+        });
+    </script>
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+        <a class="brand" href="index.html">SRS</a>
+            <div class="nav-collapse collapse">
+                <ul class="nav">
+                    <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
+                    <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
+                    <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
+                    <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
+                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
+                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container">
+    <hr>
+    <footer>
+        <p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
+    </footer>
+</div>
+</body>
diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index b9938c0f6..771960b1d 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -18,7 +18,7 @@
             update_nav();
             
             // direct to the default vhost for players.
-            window.location.href = "srs_player.html?vhost=" + srs_get_player_vhost();
+            window.location.href = "srs_chat.html?vhost=" + srs_get_player_vhost();
         });
     </script>
 </head>

From 702ad69817fef17b9a9cefd1fa0d57cae60804a2 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 09:13:27 +0800
Subject: [PATCH 23/30] support query in index.html

---
 trunk/research/api-server/static-dir/index.html | 2 +-
 trunk/research/players/index.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trunk/research/api-server/static-dir/index.html b/trunk/research/api-server/static-dir/index.html
index 0b1ff9823..7607685aa 100755
--- a/trunk/research/api-server/static-dir/index.html
+++ b/trunk/research/api-server/static-dir/index.html
@@ -18,7 +18,7 @@
             update_nav();
             
             // direct to the default vhost for players.
-            window.location.href = "players/index.html";
+            window.location.href = "players/index.html" + window.location.search;
         });
     </script>
 </head>
diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index 771960b1d..f313891e7 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -18,7 +18,7 @@
             update_nav();
             
             // direct to the default vhost for players.
-            window.location.href = "srs_chat.html?vhost=" + srs_get_player_vhost();
+            window.location.href = "srs_chat.html?" + "&vhost=" + srs_get_player_vhost() + window.location.search ;
         });
     </script>
 </head>

From c23b133fdcc4bb0f21d9bb87310a1058c8a4537e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 09:18:03 +0800
Subject: [PATCH 24/30] support query in index.html

---
 trunk/research/players/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index f313891e7..c13f06e73 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -18,7 +18,9 @@
             update_nav();
             
             // direct to the default vhost for players.
-            window.location.href = "srs_chat.html?" + "&vhost=" + srs_get_player_vhost() + window.location.search ;
+            var query = "" + window.location.search;
+            query = query.substr(1);
+            window.location.href = "srs_chat.html?" + "vhost=" + srs_get_player_vhost() + "&" + query;
         });
     </script>
 </head>

From b6280f3804c4d915648b4d023f119f7a42a02542 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 09:50:10 +0800
Subject: [PATCH 25/30] jump nginx index to api-server, for ie crossdomain.

---
 trunk/auto/depends.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index 56f01dc1e..4926a0699 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -261,11 +261,8 @@ if [ $SRS_HLS = YES ]; then
     ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
     
     # override the default index.
-    cat <<END > ${SRS_OBJS}/nginx/html/index.html
-    <script type="text/javascript">
-        window.location.href = "players/index.html";
-    </script>
-END
+    rm -f ${SRS_OBJS}/nginx/html/index.html &&
+    ln -sf `pwd`/research/players/nginx_index.html ${SRS_OBJS}/nginx/html/index.html
 fi
 
 if [ $SRS_HLS = YES ]; then
@@ -302,7 +299,9 @@ fi
 
 echo "link players to cherrypy static-dir"
 rm -f research/api-server/static-dir/players &&
-ln -sf `pwd`/research/players research/api-server/static-dir/players
+ln -sf `pwd`/research/players research/api-server/static-dir/players &&
+rm -f research/api-server/static-dir/crossdomain.xml &&
+ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml
 
 #####################################################################################
 # openssl, for rtmp complex handshake

From c51842aa9aabcc00931f60178657e97b97ee44c0 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 10:05:24 +0800
Subject: [PATCH 26/30] jump nginx index to api-server, for ie crossdomain.

---
 trunk/research/players/nginx_index.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100755 trunk/research/players/nginx_index.html

diff --git a/trunk/research/players/nginx_index.html b/trunk/research/players/nginx_index.html
new file mode 100755
index 000000000..ebef63b34
--- /dev/null
+++ b/trunk/research/players/nginx_index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SRS</title>   
+    <meta charset="utf-8">
+    <script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="players/js/srs.page.js"></script>
+    <script type="text/javascript" src="players/js/srs.utility.js"></script>
+</head>
+<body>
+    <script type="text/javascript">
+        var query = parse_query_string();
+        var url = window.location.protocol + "//" + query.hostname + ":" + srs_get_api_server_port() + "/index.html" + window.location.search;
+        document.write("请确认api-server已经开启，跳转到api-server的页面（解决IE跨域问题）<br/>");
+        document.write("正在跳转，若您的浏览器没有跳转，请点击: <a href='" + url + "'>" + url + "</a>");
+        
+        setTimeout(function(){
+            window.location.href = url;
+        }, 3000);
+    </script>
+</body>

From 5cec96793183c3dcc2643e5996bae45528911c3c Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 13:31:52 +0800
Subject: [PATCH 27/30] refine the index. refine the parse_query_string, add
 user_query object to result

---
 trunk/research/players/index.html         | 20 +++++++++++++++-----
 trunk/research/players/js/srs.page.js     |  1 +
 trunk/research/players/js/srs.utility.js  |  5 +++++
 trunk/research/players/jwplayer6.html     |  2 +-
 trunk/research/players/osmf.html          |  2 +-
 trunk/research/players/srs_bwt.html       |  2 +-
 trunk/research/players/srs_chat.html      |  2 +-
 trunk/research/players/srs_player.html    |  2 +-
 trunk/research/players/srs_publisher.html |  2 +-
 trunk/research/players/vlc.html           |  2 +-
 10 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index c13f06e73..ee2b2687c 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
@@ -17,10 +18,19 @@
         $(function(){
             update_nav();
             
-            // direct to the default vhost for players.
-            var query = "" + window.location.search;
-            query = query.substr(1);
-            window.location.href = "srs_chat.html?" + "vhost=" + srs_get_player_vhost() + "&" + query;
+            var query = parse_query_string();
+            var url = "srs_chat.html?vhost=" + srs_get_player_vhost();
+            
+            for (var key in query.user_query) {
+                if (key == "vhost") {
+                    continue;
+                }
+                url += "&" + key + "=" + query[key];
+            }
+            
+            setTimeout(function(){
+                window.location.href = url;
+            }, 100);
         });
     </script>
 </head>
@@ -28,7 +38,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 165b8d8b7..067ebca55 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -31,6 +31,7 @@ function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_pla
 * update the navigator, add same query string.
 */
 function update_nav() {
+    $("#srs_index").attr("href", "index.html" + window.location.search);
     $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search);
     $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search);
     $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search);
diff --git a/trunk/research/players/js/srs.utility.js b/trunk/research/players/js/srs.utility.js
index 1f2bb1eeb..e3886cc77 100755
--- a/trunk/research/players/js/srs.utility.js
+++ b/trunk/research/players/js/srs.utility.js
@@ -17,6 +17,7 @@ function padding(number, length, prefix) {
 function parse_query_string(){
     var obj = {};
     
+    // add the uri object.
     // parse the host(hostname:http_port), pathname(dir/filename)
     obj.host = window.location.host;
     obj.hostname = window.location.hostname;
@@ -30,6 +31,9 @@ function parse_query_string(){
         obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/"));
     }
     
+    // pure user query object.
+    obj.user_query = {};
+    
     // parse the query string.
     var query_string = String(window.location.search).replace(" ", "").split("?")[1];
     if(query_string == undefined){
@@ -40,6 +44,7 @@ function parse_query_string(){
     $(queries).each(function(){
         var query = this.split("=");
         obj[query[0]] = query[1];
+        obj.user_query[query[0]] = query[1];
     });
     
     return obj;
diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index 91eebbf82..d95272ab7 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -82,7 +82,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 9a4244e74..379e5ef0c 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -78,7 +78,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 095c910b7..e12b64c58 100755
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -28,7 +28,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 804f7efa5..4a4276557 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -546,7 +546,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 77afeb482..268fae69f 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -269,7 +269,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 3f90e8983..2e2f0323f 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -214,7 +214,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
index 2cd976676..18e7561dd 100755
--- a/trunk/research/players/vlc.html
+++ b/trunk/research/players/vlc.html
@@ -24,7 +24,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>

From 2e58de393ab92c089a79d97b44c22b435b209f6c Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 15:41:04 +0800
Subject: [PATCH 28/30] refine the ui of chat, to 5x3+1

---
 trunk/research/players/js/srs.page.js         |  12 ++--
 trunk/research/players/js/srs.player.js       |  10 +--
 trunk/research/players/srs_chat.html          |  41 +++++++-----
 trunk/research/players/srs_player.html        |   6 +-
 .../players/srs_player/release/srs_player.swf | Bin 5333 -> 5332 bytes
 .../players/srs_player/src/srs_player.as      |  62 +++++++++---------
 .../srs_publisher/release/srs_publisher.swf   | Bin 5201 -> 5203 bytes
 7 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 067ebca55..892e743f2 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -251,7 +251,7 @@ function srs_initialize_codec_page(
     
     $(sl_size).empty();
     var sizes = ["176x144", "320x240", "352x240", 
-        "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
+        "352x288", "480x360", "640x480", "720x480", "720x576", "800x600", 
         "1024x768", "1280x720", "1360x768", "1920x1080"];
     for (i = 0; i < sizes.length; i++) {
         $(sl_size).append("<option value='" + sizes[i] + "'>" + sizes[i] + "</option");
@@ -294,7 +294,7 @@ function srs_publisher_initialize_page(
     $(sl_gop + " option[value='10']").attr("selected", true);
     
     //var sizes = ["176x144", "320x240", "352x240", 
-    //    "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
+    //    "352x288", "480x360", "640x480", "720x480", "720x576", "800x600", 
     //    "1024x768", "1280x720", "1360x768", "1920x1080"];
     $(sl_size + " option[value='640x480']").attr("selected", true);
     
@@ -322,16 +322,16 @@ function srs_chat_initialize_page(
     
     //var levels = ["1", "1b", "1.1", "1.2", "1.3", 
     //    "2", "2.1", "2.2", "3", "3.1", "3.2", "4", "4.1", "4.2", "5", "5.1"];
-    $(sl_level + " option[value='2.1']").attr("selected", true);
+    $(sl_level + " option[value='3.1']").attr("selected", true);
     
     //var gops = ["0.3", "0.5", "1", "2", "3", "4", 
     //    "5", "6", "7", "8", "9", "10", "15", "20"];
-    $(sl_gop + " option[value='1']").attr("selected", true);
+    $(sl_gop + " option[value='2']").attr("selected", true);
     
     //var sizes = ["176x144", "320x240", "352x240", 
-    //    "352x288", "460x240", "640x480", "720x480", "720x576", "800x600", 
+    //    "352x288", "480x360", "640x480", "720x480", "720x576", "800x600", 
     //    "1024x768", "1280x720", "1360x768", "1920x1080"];
-    $(sl_size + " option[value='640x480']").attr("selected", true);
+    $(sl_size + " option[value='480x360']").attr("selected", true);
     
     //var fpses = ["5", "10", "15", "20", "24", "25", "29.97", "30"];
     $(sl_fps + " option[value='15']").attr("selected", true);
diff --git a/trunk/research/players/js/srs.player.js b/trunk/research/players/js/srs.player.js
index 1b1d7a882..3d9da3bb5 100755
--- a/trunk/research/players/js/srs.player.js
+++ b/trunk/research/players/js/srs.player.js
@@ -113,13 +113,13 @@ SrsPlayer.prototype.resume = function() {
     this.callbackObj.ref.__resume();
 }
 /**
-* to set the DAR, for example, DAR=16:9
-* @param num, for example, 9. 
-*       use metadata height if 0.
-*       use user specified height if -1.
-* @param den, for example, 16. 
+* to set the DAR, for example, DAR=16:9 where num=16,den=9.
+* @param num, for example, 16. 
 *       use metadata width if 0.
 *       use user specified width if -1.
+* @param den, for example, 9. 
+*       use metadata height if 0.
+*       use user specified height if -1.
 */
 SrsPlayer.prototype.set_dar = function(num, den) {
     this.callbackObj.ref.__set_dar(num, den);
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 4a4276557..d06987bf0 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -17,6 +17,9 @@
         body{
             padding-top: 55px;
         }
+        .accordion-group {
+            width: 310px;
+        }
     </style>
     <script type="text/javascript">
         var srs_publisher = null;
@@ -34,6 +37,19 @@
             // url set to: rtmp://demo:1935/live/livestream
             srs_init_publish("#txt_url");
             
+            // support 5x3+1 users
+            for (var i = 0; i < 5; i++) {
+                var tr = $("<tr></tr>").hide();
+                $("#lst_chats").append(tr);
+                
+                for (var j = 0; j < 3; j++) {
+                    tr.append($("<td></td>").attr("id", "td_" + ((i+1) * 8 + j)));
+                }
+            }
+            // remove border of row.
+            $("#lst_chats").find("td").css("border", "none").css("padding", "2px")
+                .css("padding-left", "0px").css("width", "327px");
+            
             if (query.agent == "true") {
                 document.write(navigator.userAgent);
                 return;
@@ -60,7 +76,7 @@
             $("#txt_url").val($("#txt_url").val() + "." + new Date().getTime());
             
             // start the publisher.
-            srs_publisher = new SrsPublisher("local_publisher", 430, 185);
+            srs_publisher = new SrsPublisher("local_publisher", 280, 180);
             srs_publisher.on_publisher_ready = function(cameras, microphones) {
                 srs_chat_initialize_page(
                     cameras, microphones,
@@ -85,7 +101,7 @@
             
             if (!no_play) {
                 // start the realtime player.
-                realtime_player = new SrsPlayer("realtime_player", 430, 185);
+                realtime_player = new SrsPlayer("realtime_player", 280, 180);
                 realtime_player.on_player_ready = function() {
                     this.set_bt(0.5);
                 };
@@ -98,18 +114,6 @@
                 realtime_player.start();
             }
             
-            // 2x8 users
-            for (var i = 0; i < 8; i++) {
-                var tr = $("<tr></tr>").hide();
-                $("#lst_chats").append(tr);
-                
-                for (var j = 0; j < 2; j++) {
-                    tr.append($("<td></td>").attr("id", "td_" + (i * 8 + j)));
-                }
-            }
-            // remove border of row.
-            $("#lst_chats").find("td").css("border", "none");
-            
             $("#txt_name").focus();
             
             api_server = "http://" + query.hostname + ":" + srs_get_api_server_port() + "/api/v1/chats";
@@ -321,7 +325,7 @@
                         $(obj).find("#chat_player_raw").attr("id", "rp_raw_" + chat.id); // for specifed player: $("#rp_raw_" + chat_id)
                         $(obj).find("#user_name").text(chat.username);
                         $(obj).find("#user_player_url").attr("href", chat.url);
-                        $(obj).find("#join_date").text(chat.join_date_str);
+                        $(obj).find("#join_date").text(chat.join_date_str.split(" ")[1]);
                         $(obj).find("#collapseM").attr("id", "collapse_" + global_chat_user_id);
                         $(obj).find("#headerN").attr("href", "#collapse_" + global_chat_user_id);
                     }
@@ -352,7 +356,7 @@
                     
                     if (!no_play) {
                         // start the realtime player.
-                        var _player = new SrsPlayer("rp_raw_" + chat.id, 430, 185, chat);
+                        var _player = new SrsPlayer("rp_raw_" + chat.id, 240, 180, chat);
                         _player.on_player_ready = function() {
                             this.set_bt(0.5);
                             this.play();
@@ -580,7 +584,7 @@
     </div>
     <table id="lst_chats" class="table">
         <tr>
-            <td>
+            <td id="td_0">
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <span class="accordion-toggle">
@@ -594,7 +598,7 @@
                     </div>
                 </div>
             </td>
-            <td>
+            <td id="td_1">
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <span class="accordion-toggle">
@@ -611,6 +615,7 @@
                     </div>
                 </div>
             </td>
+            <td id="td_2"></td>
         </tr>
     </table>
     <div class="container hide" id="template">
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 268fae69f..111aabfea 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -196,13 +196,13 @@
                     select_dar("#btn_dar_original", 0, 0);
                 });
                 $("#btn_dar_21_9").click(function(){
-                    select_dar("#btn_dar_21_9", 9, 21);
+                    select_dar("#btn_dar_21_9", 21, 9);
                 });
                 $("#btn_dar_16_9").click(function(){
-                    select_dar("#btn_dar_16_9", 9, 16);
+                    select_dar("#btn_dar_16_9", 16, 9);
                 });
                 $("#btn_dar_4_3").click(function(){
-                    select_dar("#btn_dar_4_3", 3, 4);
+                    select_dar("#btn_dar_4_3", 4, 3);
                 });
                 $("#btn_dar_fill").click(function(){
                     select_dar("#btn_dar_fill", -1, -1);
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index 176e8d6be3984d2c84fb206f712f6529d5f5726a..bb8c116471eaee436676ad569e19f8fc6a3e3698 100755
GIT binary patch
literal 5332
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

literal 5333
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

diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as
index 4e4891a05..0b5282a6f 100755
--- a/trunk/research/players/srs_player/src/srs_player.as
+++ b/trunk/research/players/srs_player/src/srs_player.as
@@ -37,8 +37,8 @@ package
         private var user_w:int = 0;
         private var user_h:int = 0;
         // user set dar den:num
-        private var user_dar_num:int = 0;
         private var user_dar_den:int = 0;
+        private var user_dar_num:int = 0;
         // user set fs(fullscreen) refer and percent.
         private var user_fs_refer:String = null;
         private var user_fs_percent:int = 0;
@@ -221,13 +221,13 @@ package
         }
         
         /**
-         * to set the DAR, for example, DAR=16:9
-         * @param num, for example, 9. 
-         *       use metadata height if 0.
-         *       use user specified height if -1.
-         * @param den, for example, 16. 
-         *       use metadata width if 0.
-         *       use user specified width if -1.
+        * to set the DAR, for example, DAR=16:9 where num=16,den=9.
+        * @param num, for example, 16. 
+        *       use metadata width if 0.
+        *       use user specified width if -1.
+        * @param den, for example, 9. 
+        *       use metadata height if 0.
+        *       use user specified height if -1.
          */
         private function js_call_set_dar(num:int, den:int):void {
             user_dar_num = num;
@@ -402,21 +402,21 @@ package
             var obj:Object = __get_video_size_object();
             
             // get the DAR
-            var num:int = user_dar_num;
             var den:int = user_dar_den;
-            
-            if (num == 0) {
-                num = obj.height;
-            }
-            if (num == -1) {
-                num = this.stage.fullScreenHeight;
-            }
+            var num:int = user_dar_num;
             
             if (den == 0) {
-                den = obj.width;
+                den = obj.height;
             }
             if (den == -1) {
-                den = this.stage.fullScreenWidth;
+                den = this.stage.fullScreenHeight;
+            }
+            
+            if (num == 0) {
+                num = obj.width;
+            }
+            if (num == -1) {
+                num = this.stage.fullScreenWidth;
             }
                 
             // for refer is screen.
@@ -436,23 +436,23 @@ package
          */
         private function __execute_user_set_dar():void {
             // get the DAR
-            var num:int = user_dar_num;
             var den:int = user_dar_den;
+            var num:int = user_dar_num;
             
             var obj:Object = __get_video_size_object();
             
-            if (num == 0) {
-                num = obj.height;
-            }
-            if (num == -1) {
-                num = this.user_h;
-            }
-            
             if (den == 0) {
-                den = obj.width;
+                den = obj.height;
             }
             if (den == -1) {
-                den = this.user_w;
+                den = this.user_h;
+            }
+            
+            if (num == 0) {
+                num = obj.width;
+            }
+            if (num == -1) {
+                num = this.user_w;
             }
             
             __update_video_size(num, den, this.user_w, this.user_h, this.user_w, this.user_h);
@@ -468,19 +468,19 @@ package
         * @param _sw/_wh the stage size, >= paper size. used to center the player.
         */
         private function __update_video_size(_num:int, _den:int, _w:int, _h:int, _sw:int, _sh:int):void {
-            if (!this.media_video || _num <= 0 || _den <= 0) {
+            if (!this.media_video || _den <= 0 || _num <= 0) {
                 return;
             }
             
             // set DAR.
             // calc the height by DAR
-            var _height:int = _w * _num / _den;
+            var _height:int = _w * _den / _num;
             if (_height <= _h) {
                 this.media_video.width = _w;
                 this.media_video.height = _height;
             } else {
                 // height overflow, calc the width by DAR
-                var _width:int = _h * _den / _num;
+                var _width:int = _h * _num / _den;
                 
                 this.media_video.width = _width;
                 this.media_video.height = _h;
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index c7c7b58050120f73b6ef8a14cdc67e9a54d08d50..3f173e84a0b31bfe642df4017427f334aba17d8e 100755
GIT binary patch
literal 5203
zcmV-Z6s+q*S5ppSApih)0fku!cpSx*u2<bNJw2n#vLxSe8wM=FSjSkBE!i?2OKMBP
zmWAbmYZ!WFx-|oHi0Ph@1UZC_z~QvPHdnGyAR!0IE`%e29OPOy30X3hH;`+S4V!G(
zO%^xFZcY;Ns(Qw<3?%x#>R0uSzh1q1^{OOI67dy6svaR^DUiNJ%LpOwTl@kLvN;zw
zx_9@f%49l~F}rcpvo>K_<J~PS6B8576YHC^xv`eEuCA_@)?iC8xDGYenNt}{n_QPM
z&t1EP1N7-;ESDU&lG%*H0JUf~Z}qHQTSAS;PJ@o;b14oPkG1G2J*{Ufv!$)M4T0jZ
zZX=sZYt|NRd_0wmX$-Dqa-EsT#;%>v3i>)DrJ0G%E%S=Z#!6Z#eM=~wjp~Y;(kGR6
zB{Xl(wH+0v9G`b|%Nfhmn00e3n{FA;W#jo6`eYy!H$KyZL5%04sic|Eb6fJ6Yctu2
z4A+|HGM!jX*R1S9jWUnPQ(9&$uZ`(j`iHso=`r_Fv-B-}dQ1s+29#iH+j_?h#@*b)
zqI*WPOB~$5Eu^X@zifEdx{=W6=>A>1`$(}GcX`22U(Kt+X3|UFeDlrAy#k8d*hKe-
zFL$(zrN`FwVotp1HFIX<^oq!Hb!0UmC?E^@HKdtHB(57{2}16pl?$btc6VQioGWv>
zscX4d;>z)qHl-tDff|ltn>H<AHEX6XZ|b>7A(oBnF{iKbzRR>QYOekQrcDLUhGw1h
z&8kpeUw>a@&#uVmp3wIG26M`^^mHVfiD>b7#L7mvVGRzr?T#dhGkR{tf{9xej0C-4
z$$XB2mNOx?IH#wx1$}|Nca-@PN+riKm5w{{q{-Il*|TdTvZG(!<I<S0itCNWw3NOR
z*W?*SKYK$v`en1s^7UpjmOg3i)H8XH1C>wuV)M+JL^7^#%O_LTU}g~4W{SCN*7ByZ
zT3pW!W{j+NT+3-`-NF#NcSWz!V-`)us}h>IYa%m}%Z}?gYidm?=jZc1G`hYe*xK6J
z5@pcIjH^GF%jW9SdDBwNaXpqalDer_30+CXYZt@^x5?jHw_w%XqvN@xrTZ5$`<#$C
zKCxwLNeun!g-V0C`kWTCk_FvST(MBT0A!^jbGE*l?+BA?Rt%4&>l!nHzT(!O&fo|h
z$M{q|3f{_HsHpSRpRLHbix${UXt_+?*?NrWnn=d2gqtVuggc=p#}bw^O1OJ*e{!17
z@jk7`lbSrHTMpNi&RcriGpfh(7{jSjb~|}oS>}#t89gP9>>k_~>b<N23**G7ZsD$t
znTsP4HjJdQm{E}!pU7+K)}CZq$68#PGjAnRX6^jpzy<Ko1QzTp7Qtiz%T4#Z;+dyN
zEM${$$(h3RrIRsCu0%GYn~VA<aT7CIif^W&#q_GuMwR%oR?w0uEt=9@7H+n_^cqvi
zWG%(<L9udEN($%AHOrCm=2fGMxS~{f>_bm_aU9iR*Sc}dR(8CitilGa3@+Vtg>pG<
z%DeNlZ%cE!l}lp6D9)OclKYLdO^TL@D`%{t5t>9cW8>e8NjZ2TD@`K1CKi{#dA<Y`
z#_#b26h7=Z=WpV19U+;q+@t7dW~{VH3QMUH(we^sz!YnSbqmdPE#2)*E+(-sRB^6m
z<xPH4d|D=(nM!B#raxGRB0P~9EEagzmW|??rB$C%k65{pM|0)~FW~%g!17$sbC|7+
zbSvU`-b_?8|5(M!C8K$~{VEwmso$;mVpvkLX<oWkE||8t<Uw<9Dr@TTic;3`h%Dh>
zhFbD565~oM9S0O=#Ou?%&O5-Xn0tEst%wHaFD=<CR#qv2JAzej@9bzk7Sm0$f*)hd
zLl$+JN1FGX#LwuK*HK{T?pP{`mz8(8e-FE+_Us+SQ_JdZJW{~op2cP2edl&k)9u`T
zr!};EJXzB4&S$IJxfg4kN#^-J&9byuBE*bJE;_Ikj-Zzp2mv2s(Bi{a6<#WFeR7xK
zHuF(ji&QF|UT0mysJ*Cs%1R=Ct2@F=ofL73TpeDqIg5p_q`|s!KylWgh(n{hhGoRV
z<W3q>C~#a?JiJt*C%(8|NXB#?g-Wc8^QX7Y$%6UiMNqul*&a3vUT&E)j<5oaWh_<=
zYDzi8m&`01&a!kOqtq_Y<K?&^#5Y;#(=$muj^~hLDBdO|X)0X9SISm){3;h@iYJ@d
zw!aVSqEyN(mlfNaOP%-jr}(Vsx_Dy0L&+%XvU=xsb_mk7JUaaumP421@zr5X$(*$t
zE9!Yyj5x2>u)_05(U~6ZgfjnV=vEwA<9wK#9KAALj}%aHh}I)F27|2~tpnFLRdS%R
zg2<%a(QG~w?`5g%8Xf8HztqLky4ql`6LUn*jbQ24t){n+L-|0Qk?y|9U}rnN%MCof
zGV7<Xj;Ca2FVu0fj`1$mr&Klpzj_K<%IAppv&*=`=@0O`xY8MHOX3Y=>7`LAU=;~O
zD&MF=VZ8GK%uQwA2)@JPS$0ve;XpGgozC%cAe*I<hhiF^H@*SX!ABQ!S=<>K9QJGr
zjrQ*t9PW2<=iS5kbX3m?#<(erWyeJ`dA$ykE_^yBEh*}_);7OqygDceHgO|cY-wN4
z-ak*t1$O7~X?m6hlxxolOe4<M)YGs@;h>F9G@2BClzZ@0I)}N(9Z=A@9&bP?xx>2G
zIeFEyge`9$D_Ntw?v+DUjSr5}s&}wGTFmEIsIwS#&fY8udF)-x9xSD;_&e#rft`9u
zV-r57{Bfqwd8YR!u&lbckFuG@mvRE5<zbHpCZMqdOf88-;yG<15=~)3M%aU5EXPu}
z620JBye7V*BX4<bdB$?ucp@1y<)}WE%&5s!%EKnujkl|$XX1>p?wzv!Z9PE`$Fl6V
z7yKP7nMtxc8jEdeTo})qLRWCT(ACu;wzYPw7u)bhYzww_iEZm!+ws$m!}S|Bif!#d
z9Ck24M<?oawxLC5XHab0z$`X0<&7Q4>uPJo52^%PgKc84qjkO5-nwyv*xuFEDRu<g
z+r^HJ9i6VW)(!3WZENe==xPgg1%s}(4eQ&mzp*pe>2}`#)%=|?|01tk@OWSJmZyHh
z0(o!wH-wet)yMELadrsM&8{|KV|!b@3mRyHr=hlCndcnWc}wV0SPsk2U%qyE<MO8E
z7c^{W*whee7-+bjRseNN9@*=wsI02~AV?re;F6FhND`GL@JiGt(HcoyB+<nZt&_xh
zi8e@diR4-;(d80dA<>l*T_w?XNp!X3UL(<SWd(6Almqx(CpY7_MQ+7!n;gXNdbu6H
z9a2rFL^n#bOIp+|E!r&69*J&|;3BDZs|4F5+9xgEF3~}W4oR?6qQer5Nc0kk?v`ps
zCAwdtS4lJ?(U^Q0NJ3m51Id+;*MNKtNbZ!J28m`RxK4tc1bGQ2rMf8zZjk7^CHfu-
z-Ya?DCwZpPj~hYq9Kd!E`!}J{4APsC-h#YC2z4vA+i-k4jw>b49Z0egy$3l*QS&&+
z_X76s!~Xpse*pWyV)!9!4}nzoFvuTa@{gj~UDys|dj!WH$MzX)Pk>bOB+{p_J&o<N
zAU_Qte;sXVp2zXOVEYEh-((oy0{I1$eH+`q;@JHiSOId8Y5oAEKg9MUZ2yk!$Jl;?
z9=w9|KT-ZOq(8^@U)X{YZI|ea*n1T<{u}B4VEYxe|Hbwiwo}+Z5)V^JI6@`yZfy5p
zJ4$N^q4?L13Ifey?{p<;zLe1BuI}*kWtTImAtlWer9E`Il6?<Ux|+MYy6Wpc1_uto
zU2qtt;UJLaPXG~`2RGDz4yHc|k0J|4{`&u5qv~mZX8$i?x*8$7Y?x+NY~Izc1N<6(
z1DyPyL;l|(zjes(9P)dI{J|lAbjY6^@`gkH?2x}W<V}Z6Qx1KjLk>9PphIqQ$c#g7
zcE~LbIpmP{JLFb}+~$zm9dd_5?sUjq^ccmZ9Ct?dQn(lH16d}pYS~uOT~PsKg+pPL
zL+NUV3RgQ+T(gyQfdH;^9qNXyq@LieapD=;N)m`74{RlaNWF(pd@Eqjw|6V?Bdr+S
zN;V*^)K$_&1*nQ46$Gd@kctA-s7PG`EZUCLEkLb1L?|p?7a{`G^@oTE^<yD|1tu6G
zGAwBi5icwq2@xMG+ZiGiu>8Uhse~0rAVjKQCH{%58kg7ygsys54FT}TLa}u_vIUU6
z+g=y!jm1`bZE-J2fZfOlwY!Rg#O^K{!tvTVLhMb&uxN;et7y1Yi8j@Ekk?aGR5vu)
z7a<ZAMA`caAXI;`^%PW+{!>r|!>6E{US+Fi7<*`wJ%F%b*^mvd=CcRcpu(syDzz&6
z;$paZsG4Xs_Ku=aqb?#%_HfatH5MCn)AcXeBXa>oZGhvoUY!1t@RERkXbA}Rp5mOb
zR9j~6MY>#DVedn_Qd?#3NBS;pwS75KMO$NEf%F{hT>Gl9-|(yFk!k<ScI2dSek~p=
z`|9voV{N$6Xf&GC3vgAj;z{*Fq<T0|G}ifv8bHqtT&my_WbaY7)D&B4KPj976(;O-
zxW#BOT94N*N3=}1EpV~ghW1&<KF;mOx7#LD3*hpC>Uu=9_;6RzXy?NMbIs_O?)<Jj
z5#C^IVBMGONkrRoVm7dMc5XJXZ<ga;&kT#kilVXX#GJZOY_e}a=R^^m+l0PN19R>&
zG7YETay<0*jesCmAjp*n!VwOD1F?!hs2hbQ`ye2Ms|;~d3F0OWaTC}x4C3lDA#N@~
ztUe8K3xjYI@Os_o#WQRq3DoCX#ggKOENVYuDA5zfCS$YX$4{7&M-+S&_lPKe7WQB8
z68f&gv!D}Yx-%{4<U|^ss3gyV{ds0?=p+U62wy}+HV%wob`&lsu>5E$scb3K9>fiK
z4pqVz1(HJ-!9HM^_LoaW#+JY}>Q*S!u0pl1Fs6Wt*OtwV&@9@h+i)wtHgAzWZSnQ8
zMdq|c?`ezYAzWkBFi5S>{$|;Hb6~s<52gJr2)C>4nBy-%xIe5KYQR+cF(<wa+wB+U
zl`XFPow9O~DQ`En2MS#I1S)@bUU_1%h{!J?^ZRhsKzJ}bWDE@rLSn%F0fYyPfxSe#
z*#05!hI@=2W5-sB9cYaEPa(XMX@rN3;qWeFm%0-(;uQ#waONe(CE?x1Zgm8iKZEe7
zF<Pj_KjYg!cc4(L?!gfK0>XQZy^iQrM}%<dJ{0{Doeb|c_OljvKd6_2dKt{5sr@Ui
zhe4w1<*4@>gfC<u{Pdl|+z_rH&_k{yw3~#9&`D&M<gIvwrOFY^(ES(0+?XwQg6jyT
zj556;?PkQEmUO_Z(P1u4bvTJh1W_?9;@6dSoq|I^j$lgN1;EH*po~m|z{o)mkAQtQ
zOEiX=g4w{`FdM$gxC#fN8o}|g(_<GK^Ye5RicDF%+CIj66id!=-V?Cs+{=5S2KIft
z=hCSC02KNDf3WPi{UJ7=`*>{whISVFtOg**WoT*?*xKxexQ0@<7BwD*V$p~N9$+j~
znGHM$v%DMUWrF3>M=%pU!GN%?ph!fZ^MFOi{v@-K9H2)TkRJF4#zK`ckZ8;UeF}jd
z<0kBYVf}An=EnJjT0eU7I0G;O%;mQLd>G?1hORux*DYy#?WcIpt&Q5Bg<?1{lpxxW
z{W&NaLp(j7VLjvGt!^#J>j92Rx#}t9>gza9(YV@A@KequI+OO;zh<WBgGapvQ|ULD
zJ)Zppy2-VKc99ejy2vgf)|1`DRZlJ<?hRy^NPdzgo^Il$co|-X6aF5v%Kifa4HRlw
zl>f-O3QzApIbD{{Z?LYK!PEO^C@R{3{U$Po3bl*SVwz%?%WkA78?p~lEO9=;EqiBK
z37ny<IDZnz3_kT91z_YLP)0rl!eJzz#uTLX&2;W~Ej!P*(CzkZbWW*bgWGX%nEE|t
zOtg<se}frw+4oRP)_;V+KY@Le&PK)Az++$^!=7t4@OUXdAEa|pQOnx1NL|{v{V<&i
zUuRrr<TTU%2%YnTX4xNQj#h}3viAi69et$i=p*P;HL&kAP)42s;V~r7g7`R+&x7kT
zNWK8>Cy;y*q$iPl2|Q0Bc@7`cNWKi-XOMgae9u$+W95Z?9M|$FJ!#|vUxhk$4S$L)
z<ZHkW)TdGS7zzu4e}+0AA>j#Q!kC<?kxJdEnHdbh<EU}{494IyG<?HJ<K5~FkdL|T
zCuq3qr174p`ysUp%$Q_9NyFVIjrXeE5O@*P_ko`n(<t!RPn|6QE|Be~ImC^?0lfAz
z)W6q^`Rva#7f(Q74(u;Du|5g*7oAxD8`xjMo-`ZyF4)gu&odi%3G6RpPo53D4E9&B
z=bjCG5A3gE&pR9VKG<Kwp3kWv&(rV$7&-uC`T)c#>~GL$MO2KsRLqVh`<wJcv_iv+
z_<Oj6k~#yJhCjxxCn`tX>dk<q`Ik8K`aKVy_p0<z)TiFU%znl8w30p0o}##?ui>6H
zzKq*RUc>$PDZm@lK7|Q;2(Q33xC1utE4*gEPVrbD0`>iDs$a8QJ_Pn}X)$~&4BZMO
zfurAX^%GqE_q>0;b{p7#pyAu`K%njI%=QhGoO{B!10FhI+zAioU$Xy9=ZeOfst!U<
z!7qURh1!2Xoi$91I(MMX%l4Zb54qYMU{4DS?xc1n)GS3e5Afj}lN{t-oB(C^Olh!&
zX(P^u{q$k&F0gMdD{=mv4*xLNhXh<ADxa$!VZpjh2;a^9_7nAP#<*R;=vA>d-*yb%
z5qvnaTZ0@C*sTFa1p6KYz6Z0(59(27aI`!o_%1sJ_%J)hIqGr1V(}n@tETt{SBtF(
zxC}4FdZWHId_NfXLu>c}FdjhiAQ%rK`2ZLnKyn`#_m#<|WEKBO+{-G-5=5(A{MP?~
NZ^hpd{|bgN)~e~~Jud(N

literal 5201
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
L{4MdXL7vvI8CWA8


From 51686b91d2943e2f676d2e7e2dcdceb2ae2f298f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 15:41:54 +0800
Subject: [PATCH 29/30] change ui version to 1.17

---
 trunk/research/players/js/srs.page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 892e743f2..68ce4bd6c 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -10,7 +10,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
 // to query the swf anti cache.
-function srs_get_version_code() { return "1.15"; }
+function srs_get_version_code() { return "1.17"; }
 // get the default vhost for players.
 function srs_get_player_vhost() { return "players"; }
 // the api server port, for chat room.

From 6bba08148570d870f48edcfecab67e34f81fd6cd Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 27 Dec 2013 10:11:29 +0800
Subject: [PATCH 30/30] update the stop/start script

---
 trunk/scripts/_step.start.nginx.sh | 4 +++-
 trunk/scripts/stop.sh              | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/trunk/scripts/_step.start.nginx.sh b/trunk/scripts/_step.start.nginx.sh
index 22d2a3db4..8873f093c 100755
--- a/trunk/scripts/_step.start.nginx.sh
+++ b/trunk/scripts/_step.start.nginx.sh
@@ -4,7 +4,9 @@ if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本";
 
 cmd="sudo ./objs/nginx/sbin/nginx"
 echo "启动NGINX（HLS服务）：$cmd"
-pids=`ps aux|grep nginx|grep process|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; sudo kill -s SIGKILL $pid; done
+if [[ -f ./objs/nginx/logs/nginx.pid ]]; then 
+    pids=`cat ./objs/nginx/logs/nginx.pid`; for pid in $pids; do echo "结束现有进程：$pid"; sudo kill -s SIGTERM $pid; done
+fi
 sudo ./objs/nginx/sbin/nginx
 ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动NGINX（HLS服务）失败"; exit $ret; fi
 
diff --git a/trunk/scripts/stop.sh b/trunk/scripts/stop.sh
index a916045d6..e7a3be538 100755
--- a/trunk/scripts/stop.sh
+++ b/trunk/scripts/stop.sh
@@ -11,7 +11,9 @@ pids=`ps aux|grep srs|grep "./objs"|grep "srs.19350.conf"|awk '{print $2}'`; for
 # step 4(optinal): start nginx for HLS 
 echo "停止NGINX（HLS服务）"
 ps aux|grep nginx|grep process
-pids=`ps aux|grep nginx|grep process|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; sudo kill -s SIGKILL $pid; done
+if [[ -f ./objs/nginx/logs/nginx.pid ]]; then 
+    pids=`cat ./objs/nginx/logs/nginx.pid`; for pid in $pids; do echo "结束现有进程：$pid"; sudo kill -s SIGTERM $pid; done
+fi
 
 # step 5(optinal): start http hooks for srs callback 
 echo "停止API服务器"