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] 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;