From f8a7db51f2266ab957204ce53886fb8481f03736 Mon Sep 17 00:00:00 2001
From: wenjiegit <wenjie@localhost.localdomain>
Date: Thu, 2 Jan 2014 14:16:26 +0800
Subject: [PATCH] fixbug[play packet decode bug: srs only read bool type play
 reset value, actually this value can be bool or number]

---
 trunk/research/ffempty/Makefile               |   0
 trunk/research/ffempty/ffempty.cc             |   0
 trunk/research/hls/Makefile                   |   0
 trunk/research/hls/ts_info.cc                 |   0
 trunk/research/players/crossdomain.xml        |   0
 trunk/research/players/img/tooltip.png        | Bin
 .../players/js/AdobeFlashPlayerInstall.swf    | Bin
 .../players/js/StrobeMediaPlayback.swf        | Bin
 trunk/research/players/js/bootstrap.min.js    |   0
 .../research/players/js/jquery-1.10.2.min.js  |   0
 .../research/players/js/jquery-1.10.2.min.map |   0
 trunk/research/players/js/jwplayer.flash.swf  | Bin
 trunk/research/players/js/jwplayer.html5.js   |   0
 trunk/research/players/js/jwplayer.js         |   0
 trunk/research/players/js/srs.bandwidth.js    |  29 ----
 trunk/research/players/js/swfobject.js        |   0
 trunk/research/players/osmf.html              |   2 +-
 trunk/research/players/srs_bwt.html           | 138 ------------------
 .../players/srs_bwt/.actionScriptProperties   |  14 --
 .../players/srs_bwt/release/srs_bwt.swf       | Bin 2603 -> 4674 bytes
 trunk/research/players/srs_bwt/src/srs_bwt.as |  81 ----------
 trunk/src/core/srs_core_rtmp.cpp              |  12 +-
 trunk/src/core/srs_core_rtmp.hpp              |   4 -
 trunk/src/main/srs_main_server.cpp            |   0
 trunk/src/srs/init                            |   0
 25 files changed, 2 insertions(+), 278 deletions(-)
 mode change 100644 => 100755 trunk/research/ffempty/Makefile
 mode change 100644 => 100755 trunk/research/ffempty/ffempty.cc
 mode change 100644 => 100755 trunk/research/hls/Makefile
 mode change 100644 => 100755 trunk/research/hls/ts_info.cc
 mode change 100644 => 100755 trunk/research/players/crossdomain.xml
 mode change 100644 => 100755 trunk/research/players/img/tooltip.png
 mode change 100644 => 100755 trunk/research/players/js/AdobeFlashPlayerInstall.swf
 mode change 100644 => 100755 trunk/research/players/js/StrobeMediaPlayback.swf
 mode change 100644 => 100755 trunk/research/players/js/bootstrap.min.js
 mode change 100644 => 100755 trunk/research/players/js/jquery-1.10.2.min.js
 mode change 100644 => 100755 trunk/research/players/js/jquery-1.10.2.min.map
 mode change 100644 => 100755 trunk/research/players/js/jwplayer.flash.swf
 mode change 100644 => 100755 trunk/research/players/js/jwplayer.html5.js
 mode change 100644 => 100755 trunk/research/players/js/jwplayer.js
 mode change 100644 => 100755 trunk/research/players/js/swfobject.js
 mode change 100644 => 100755 trunk/src/main/srs_main_server.cpp
 mode change 100644 => 100755 trunk/src/srs/init

diff --git a/trunk/research/ffempty/Makefile b/trunk/research/ffempty/Makefile
old mode 100644
new mode 100755
diff --git a/trunk/research/ffempty/ffempty.cc b/trunk/research/ffempty/ffempty.cc
old mode 100644
new mode 100755
diff --git a/trunk/research/hls/Makefile b/trunk/research/hls/Makefile
old mode 100644
new mode 100755
diff --git a/trunk/research/hls/ts_info.cc b/trunk/research/hls/ts_info.cc
old mode 100644
new mode 100755
diff --git a/trunk/research/players/crossdomain.xml b/trunk/research/players/crossdomain.xml
old mode 100644
new mode 100755
diff --git a/trunk/research/players/img/tooltip.png b/trunk/research/players/img/tooltip.png
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/AdobeFlashPlayerInstall.swf b/trunk/research/players/js/AdobeFlashPlayerInstall.swf
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/StrobeMediaPlayback.swf b/trunk/research/players/js/StrobeMediaPlayback.swf
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/bootstrap.min.js b/trunk/research/players/js/bootstrap.min.js
old mode 100644
new mode 100755
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 100644
new mode 100755
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 100644
new mode 100755
diff --git a/trunk/research/players/js/jwplayer.flash.swf b/trunk/research/players/js/jwplayer.flash.swf
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/jwplayer.html5.js b/trunk/research/players/js/jwplayer.html5.js
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/jwplayer.js b/trunk/research/players/js/jwplayer.js
old mode 100644
new mode 100755
diff --git a/trunk/research/players/js/srs.bandwidth.js b/trunk/research/players/js/srs.bandwidth.js
index 4f7ccafd7..1b63b2ac8 100755
--- a/trunk/research/players/js/srs.bandwidth.js
+++ b/trunk/research/players/js/srs.bandwidth.js
@@ -1,31 +1,3 @@
-<<<<<<< HEAD
-// for bw to init url
-// url: scheme://host:port/path?query#fragment
-function srs_init_bwt(rtmp_url, hls_url) {
-    update_nav();
-
-    if (rtmp_url) {
-		//var query = parse_query_string();
-		var search_filed = String(window.location.search).replace(" ", "").split("?")[1];
-        $(rtmp_url).val("rtmp://" + window.location.host + ":" + 1935 + "/app?" + search_filed);
-    }
-    if (hls_url) {
-        $(hls_url).val(build_default_hls_url());
-    }
-}
-
-function srs_bwt_check_url(url) {
-	if (url.indexOf("key") != -1 && url.indexOf("vhost") != -1) {
-		return true;
-	}
-	
-	return false;
-}
-
-function srs_bwt_build_default_url() {
-	var url_default = "rtmp://" + window.location.host + ":" + 1935 + "/app?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com";
-	return url_default;
-=======
 /**
 * the SrsBandwidth object.
 * @param container the html container id.
@@ -161,5 +133,4 @@ function __srs_on_update_status(id, status) {
     var bandwidth = __srs_find_bandwidth(id);
     bandwidth.status = status;
     bandwidth.on_update_status(status);
->>>>>>> upstream/master
 }
\ No newline at end of file
diff --git a/trunk/research/players/js/swfobject.js b/trunk/research/players/js/swfobject.js
old mode 100644
new mode 100755
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 60ba8f619..379e5ef0c 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -57,7 +57,7 @@
             // 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, "#main_modal");
+            srs_init("#txt_url", null, "#main_modal");
             
             $("#main_modal").on("hide", function(){
                 osmf_play("http://localhost");
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 681a1db45..dc2593adb 100755
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -12,119 +12,12 @@
     <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>
-<<<<<<< HEAD
-    <script type="text/javascript" src="js/srs.utility.js"></script>
-	<script type="text/javascript" src="js/srs.bandwidth.js"></script>
-=======
     <script type="text/javascript" src="js/srs.bandwidth.js"></script>
->>>>>>> upstream/master
     <style>
         body{
             padding-top: 55px;
         }
         #main_modal {
-<<<<<<< HEAD
-            width: 600px;
-            margin-left: -300px;
-        }
-        #check_status {
-            margin-left: 20px;
-            margin-top: -55px;
-        }
-        #pb_buffer_bg {
-            margin-top: 40px;
-            margin-bottom: 10px;
-        }
-    </style>
-    <script type="text/javascript">
-
-            function update_progress(percent) {
-                    $("#progress_bar").width(percent);
-            }
-
-            function progress_reset() {
-                    $("#progress_bar").width("0%");
-            }
-
-            function update_status(text) {
-                $("#check_status").text(text);
-            }
-			
-			function get_swf_width() {
-				return 1;
-			}
-			
-			function get_swf_height() {
-				return 1;
-			}
-			
-			function show_modal() {
-				$("#main_modal").modal({show:true, keyboard:false});
-			}
-
-            function band_check(url) {
-
-            // remove flash contet
-            var bw_div = $("<div/>");
-            $(bw_div).attr("id", "bw_div");
-            $("#bw_center").append(bw_div);
-
-            var flashvars = {};
-            flashvars.url = url;
-            flashvars.update_progress = "update_progress";
-            flashvars.progress_reset  = "progress_reset";
-			flashvars.update_status   = "update_status";
-
-            var params = {};
-            params.allowFullScreen = true;
-			
-            var attributes = {};
-
-            swfobject.embedSWF(
-                "srs_bwt/release/srs_bwt.swf", "bw_div",
-                get_swf_width(), get_swf_height(),
-                "11.1.0", "js/AdobeFlashPlayerInstall.swf",
-                flashvars, params, attributes
-            );
-        }
-
-        $(function(){
-            update_nav();
-			srs_init_bwt("#txt_url");
-			
-			var txt_input = $("#txt_url").val();
-			// if valid ?
-			if (!srs_bwt_check_url(txt_input)) {
-				$("#txt_url").val(srs_bwt_build_default_url());
-			}
-			
-            $("#main_modal").on(
-                "show",
-                function()
-                {
-					progress_reset();
-					update_status("");
-                   var url = $("#txt_url").val();
-				   /*!
-						url encode
-				   */
-				   url = escape(url);	
-                   band_check(url);
-                }
-             );
-
-            $("#main_modal").on("hide", function(){
-                $("#bw_div").remove();
-            });
-
-            $("#btn_play").click(
-                function()
-                {
-                    $("#main_modal").modal({show:true, keyboard:false});
-                }
-             );
-        });	
-=======
             width: 700px;
             margin-left: -350px;
         }
@@ -173,7 +66,6 @@
         function on_stop_bandwidth_test() {
             bandwidth.stop();
         }
->>>>>>> upstream/master
     </script>
 </head>
 <body>
@@ -196,31 +88,6 @@
     </div>
 </div>
 <div class="container">
-<<<<<<< HEAD
-
-     <div class="form-inline">
-         URL:
-         <input type="text" id="txt_url" class="input-xxlarge" value="" placeholder="例如：rtmp://host:port/app?key=xx&vhost=yy"></input>
-         <button class="btn btn-primary" id="btn_play">开始测速</button>
-     </div>
-
-     <div id="main_modal" class="modal hide fade">
-         <div class="modal-header">
-             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-             <h3>SRS Band Check</h3>
-         </div>
-         <div class="modal-body">
-             <div id="player"></div>
-             <div class="progress progress-striped active" id="pb_buffer_bg">
-                 <div class="bar" style="width: 50%;" id="progress_bar"></div>
-             </div>
-         </div>
-
-         <div class="modal-body" id="bw_center">
-         </div>
-         <span id="check_status1"><font ><strong id="check_status">status</strong></font> </span>
-
-=======
     <div class="alert alert-info fade in">
         <button type="button" class="close" data-dismiss="alert">×</button>
         <strong><span>Usage:</span></strong> <span>点击“开始测速”即可测带宽，最大可测试带宽由服务器限制</span>
@@ -247,15 +114,10 @@
             </div>
             <span id="check_status">status</span>
          </div>
->>>>>>> upstream/master
          <div class="modal-footer">
              <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"> 关闭 </button>
          </div>
      </div>
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
     <hr>
     <footer>
         <p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
diff --git a/trunk/research/players/srs_bwt/.actionScriptProperties b/trunk/research/players/srs_bwt/.actionScriptProperties
index f073e8327..f95be3da9 100755
--- a/trunk/research/players/srs_bwt/.actionScriptProperties
+++ b/trunk/research/players/srs_bwt/.actionScriptProperties
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <actionScriptProperties analytics="false" mainApplicationPath="srs_bwt.as" projectUUID="00251213-e6a2-4dd5-a033-125cc78f843c" version="10">
-<<<<<<< HEAD
-  <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
-=======
   <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="release" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
->>>>>>> upstream/master
     <compilerSourcePath/>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="4" path="">
@@ -21,15 +17,6 @@
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
-<<<<<<< HEAD
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/spark_dmv.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flash-integration.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
-=======
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
@@ -37,7 +24,6 @@
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flash-integration.swc" useDefaultLinkType="false"/>
->>>>>>> upstream/master
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_flashflexkit.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
         </excludedEntries>
diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf
index 3e89783117da7113a3b86e0611bfe262224ed0c3..a76afa2c7146557a2a6f4bb0924840c578d054a8 100755
GIT binary patch
literal 4674
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
Eo42tXT>t<8

literal 2603
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
NKX6Y2{9l&rPnDW$1<e2e

diff --git a/trunk/research/players/srs_bwt/src/srs_bwt.as b/trunk/research/players/srs_bwt/src/srs_bwt.as
index 8a8870cf5..bb12e965d 100755
--- a/trunk/research/players/srs_bwt/src/srs_bwt.as
+++ b/trunk/research/players/srs_bwt/src/srs_bwt.as
@@ -20,12 +20,6 @@ package
 
 	public class srs_bwt extends Sprite
 	{		
-<<<<<<< HEAD
-		private var connection:NetConnection;
-		
-		private var updatePlayProgressTimer:Timer;
-		private var elapTimer:SrsElapsedTimer;
-=======
 		private var connection:NetConnection = null;
 		
 		private var updatePlayProgressTimer:Timer = null;
@@ -35,7 +29,6 @@ package
         private var js_id:String = null;
         // play param url.
         private var user_url:String = null;
->>>>>>> upstream/master
 		
 		// server ip get from server
 		private var server_ip:String;
@@ -44,13 +37,8 @@ package
 		private var stop_pub:Boolean = false;
 		
 		// js interface
-<<<<<<< HEAD
-		private var js_update_progress:String;
-		private var js_progress_reset:String;
-=======
 		private var js_on_player_ready:String;
 		private var js_update_progress:String;
->>>>>>> upstream/master
 		private var js_update_status:String;
 		
 		private var value_progressbar:Number = 0;
@@ -61,8 +49,6 @@ package
 		
 		public function srs_bwt()
 		{
-<<<<<<< HEAD
-=======
             if (!this.stage) {
                 this.addEventListener(Event.ADDED_TO_STAGE, this.system_on_add_to_stage);
             } else {
@@ -75,23 +61,10 @@ package
          * the main function.
          */
         private function system_on_add_to_stage(evt:Event):void {
->>>>>>> upstream/master
 			this.stage.scaleMode = StageScaleMode.NO_SCALE;
 			this.stage.align = StageAlign.TOP_LEFT;
 			
 			var flashvars:Object 	   = this.root.loaderInfo.parameters;
-<<<<<<< HEAD
-			this.js_update_progress    = flashvars.update_progress;
-			this.js_progress_reset     = flashvars.progress_reset;
-			this.js_update_status 	   = flashvars.update_status;
-						
-			// init context menu, add action "Srs 带宽测试工具 0.1"
-			var myMenu:ContextMenu  = new ContextMenu();
-			myMenu.hideBuiltInItems();
-			myMenu.customItems.push(new ContextMenuItem("Srs 带宽测试工具 0.1", true));
-			this.contextMenu = myMenu;
-			
-=======
             
             if (!flashvars.hasOwnProperty("id")) {
                 throw new Error("must specifies the id");
@@ -131,16 +104,11 @@ package
         private function js_call_check_bandwidth(url:String):void {
             js_call_stop();
             
->>>>>>> upstream/master
 			// init connection
 			connection = new NetConnection;
 			connection.client = this;
 			connection.addEventListener(NetStatusEvent.NET_STATUS, onStatus);
-<<<<<<< HEAD
-			connection.connect(flashvars.url);
-=======
 			connection.connect(url);
->>>>>>> upstream/master
 			//connection.connect("rtmp://192.168.8.234:1935/app?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com");
 			
 			// for play to update progress bar
@@ -151,12 +119,6 @@ package
 			updatePlayProgressTimer.addEventListener(TimerEvent.TIMER, onTimerTimeout);
 			updatePlayProgressTimer.start();
 		}
-<<<<<<< HEAD
-		
-		// get NetConnection NetStatusEvent
-		public function onStatus(evt:NetStatusEvent) : void{
-			trace(evt.info.code);			
-=======
         private function js_call_stop():void {
             if (connection) {
                 connection.close();
@@ -187,7 +149,6 @@ package
                 contextMenu.customItems = customItems;
             }
             
->>>>>>> upstream/master
 			switch(evt.info.code){
 				case "NetConnection.Connect.Failed":
 					updateState("连接服务器失败！");
@@ -203,10 +164,6 @@ package
 					//updateState("连接已断开!");
 					break;
 			}
-<<<<<<< HEAD
-			
-		}
-=======
 		}
         
         public function onTimerTimeout(evt:TimerEvent):void
@@ -214,7 +171,6 @@ package
             value_progressbar = elapTimer.elapsed();
             updateProgess(value_progressbar, max_progressbar);
         }
->>>>>>> upstream/master
 		
 		/**
 		 * NetConnection callback this function, when recv server call "onSrsBandCheckStartPlayBytes"
@@ -225,27 +181,13 @@ package
 			var interval_ms:Number = evt.interval_ms;
 			
 			connection.call("onSrsBandCheckStartingPlayBytes", null);
-<<<<<<< HEAD
-			updateState("测试下行带宽(" + server_ip + ")");	
-=======
 			updateState("开始测试下行带宽，服务器IP：" + server_ip);
->>>>>>> upstream/master
 			
 			// we suppose play duration_ms = pub duration_ms
 			max_progressbar = duration_ms * 2;
 		}
 		
 		public function onSrsBandCheckPlaying(evt:Object):void{
-<<<<<<< HEAD
-
-		}
-		
-		public function onTimerTimeout(evt:TimerEvent):void
-		{	
-			value_progressbar = elapTimer.elapsed();
-			updateProgess(value_progressbar, max_progressbar);
-=======
->>>>>>> upstream/master
 		}
 		
 		public function onSrsBandCheckStopPlayBytes(evt:Object):void{			
@@ -261,10 +203,7 @@ package
 			kbps = (int(kbps * 10))/10.0;
 
 			flash.utils.setTimeout(stopPlayTest, 0);
-<<<<<<< HEAD
-=======
             updateState("下行带宽测试完毕，服务器: " + server_ip + "，" + kbps + "kbps，开始测试上行带宽。");
->>>>>>> upstream/master
 		}
 		
 		private function stopPlayTest():void{
@@ -276,10 +215,6 @@ package
 			var interval_ms:Number = evt.interval_ms;
 						
 			connection.call("onSrsBandCheckStartingPublishBytes", null);
-<<<<<<< HEAD
-			updateState("测试上行带宽(" + server_ip + ")");
-=======
->>>>>>> upstream/master
 			
 			flash.utils.setTimeout(publisher, 0);
 		}
@@ -343,35 +278,19 @@ package
 			connection.call("finalClientPacket", null);
 		}
 		
-<<<<<<< HEAD
-		public function onBWDone():void{
-			// do nothing
-		}
-		
-		// update progressBar's value
-		private function updateProgess(value:Number, maxValue:Number):void{
-			flash.external.ExternalInterface.call(this.js_update_progress, value * 100 / maxValue + "%");
-=======
 		// update progressBar's value
 		private function updateProgess(value:Number, maxValue:Number):void{
 			flash.external.ExternalInterface.call(this.js_update_progress, this.js_id, value * 100 / maxValue);
->>>>>>> upstream/master
 			trace(value + "-" + maxValue + "-" + value * 100 / maxValue + "%");
 		}
 		
 		// update checking status
 		private function updateState(text:String):void{
-<<<<<<< HEAD
-			flash.external.ExternalInterface.call(this.js_update_status, text);
-			trace(text);
-		}
-=======
 			flash.external.ExternalInterface.call(this.js_update_status, this.js_id, text);
 			trace(text);
 		}
         
         public function onBWDone():void{
         }
->>>>>>> upstream/master
 	}
 }
\ No newline at end of file
diff --git a/trunk/src/core/srs_core_rtmp.cpp b/trunk/src/core/srs_core_rtmp.cpp
index deeddd54f..bf67fb9fc 100755
--- a/trunk/src/core/srs_core_rtmp.cpp
+++ b/trunk/src/core/srs_core_rtmp.cpp
@@ -446,17 +446,7 @@ int SrsRtmpClient::publish(string stream, int stream_id)
 		}
 	}
 	
-    return ret;
-}
-
-SrsProtocol *SrsRtmpClient::get_protocol()
-{
-    return protocol;
-}
-
-st_netfd_t SrsRtmpClient::get_st_fd()
-{
-    return stfd;
+	return ret;
 }
 
 SrsRtmp::SrsRtmp(st_netfd_t client_stfd)
diff --git a/trunk/src/core/srs_core_rtmp.hpp b/trunk/src/core/srs_core_rtmp.hpp
index 6c967c1c3..54b0948af 100755
--- a/trunk/src/core/srs_core_rtmp.hpp
+++ b/trunk/src/core/srs_core_rtmp.hpp
@@ -131,10 +131,6 @@ public:
 	virtual int create_stream(int& stream_id);
 	virtual int play(std::string stream, int stream_id);
 	virtual int publish(std::string stream, int stream_id);
-
-protected:
-    SrsProtocol* get_protocol();
-    st_netfd_t get_st_fd();
 };
 
 /**
diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
old mode 100644
new mode 100755
diff --git a/trunk/src/srs/init b/trunk/src/srs/init
old mode 100644
new mode 100755