From 5bfb561f893c61e0c46c442641a741fdd2265858 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 20 Dec 2013 00:26:34 +0800
Subject: [PATCH] add srs player

---
 trunk/research/players/jwplayer6.html         |   2 +
 trunk/research/players/srs_player.html        |  42 ++++++++++--------
 .../players/srs_player/release/srs_player.swf | Bin 2645 -> 2697 bytes
 .../players/srs_player/src/srs_player.as      |   3 +-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index b87c11c0f..6eb420f73 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -21,6 +21,7 @@
                 $("#div_container").remove();
                 _player.stop();
             });
+            
             $("#main_modal").on("show", function(){
                 $("#div_container").remove();
                 
@@ -42,6 +43,7 @@
                 };
                 _player = jwplayer('player_id').setup(conf);
             });
+            
             $("#main_modal").modal({show:true, keyboard:false});
         }
         
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index e5b9cc31a..321535d25 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -14,13 +14,26 @@
         }
     </style>
     <script type="text/javascript">
+        var srs_player = null;
+        
         $(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"));
             
-            var srs_player = null;
+            $("#btn_play").click(on_btn_play);
+            $("#btn_pause").click(function(){
+                if ($("#btn_pause").text() == "暂停") {
+                    $("#btn_pause").text("继续");
+                    srs_player.pause();
+                } else {
+                    $("#btn_pause").text("暂停");
+                    srs_player.resume();
+                }
+            });
+        });
+        function on_btn_play(){
             $("#main_modal").on("show", function(){
                 $("#div_container").remove();
                 
@@ -35,34 +48,23 @@
                 
                 var url = $("#txt_url").val();
                 
-                srs_player = new SrsPlayer("player_id", url, 530, 300);
+                srs_player = new SrsPlayer("player_id", url, 530, 300, 0.8);
                 srs_player.on_player_ready = function() {
-                    // hack the callback function, start to play the url.
+                    // hack the callback function, do something then play.
                     return srs_player.play();
                 }
                 srs_player.start();
             });
+            
             $("#main_modal").on("hide", function(){
                 srs_player.stop();
             });
             
-            $("#btn_play").click(on_btn_play);
-            $("#btn_pause").click(function(){
-                var _v = $("#btn_pause").text();
-                if (_v == "暂停") {
-                    $("#btn_pause").text("继续");
-                    srs_player.pause();
-                } else {
-                    $("#btn_pause").text("暂停");
-                    srs_player.resume();
-                }
-            });
-        });
-        function on_btn_play(){
             $("#main_modal").modal({show:true, keyboard:false});
         }
         
-        function SrsPlayer(container, stream_url, width, height) {
+        // the SrsPlayer object.
+        function SrsPlayer(container, stream_url, width, height, buffer_time) {
             if (!SrsPlayer.__id) {
                 SrsPlayer.__id = 100;
             }
@@ -76,9 +78,13 @@
             this.stream_url = stream_url;
             this.width = width;
             this.height = height;
+            this.buffer_time = buffer_time;
             this.id = SrsPlayer.__id++;
             this.callbackObj = null;
         }
+        // user can set some callback, then start the player.
+        // callbacks:
+        //      on_player_ready():int, when srs player ready, user can play.
         SrsPlayer.prototype.start = function() {
             // embed the flash.
             var flashvars = {};
@@ -105,7 +111,7 @@
             return this;
         }
         SrsPlayer.prototype.play = function() {
-            return this.callbackObj.ref.__play(this.stream_url, this.width, this.height);
+            return this.callbackObj.ref.__play(this.stream_url, this.width, this.height, this.buffer_time);
         }
         SrsPlayer.prototype.stop = function() {
             return this.callbackObj.ref.__stop();
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index 93d6f5655b5b2f86896f601153b89d106ca33bc6..d79fafd00e2665a127d80b7060ca489f52e39722 100755
GIT binary patch
literal 2697
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
D=D8>H

literal 2645
zcmV-b3aa%(S5poM5C8yp0c}@Va}&uO@9vS*x_n?8V~hbAY`pl8<Qoex7M5i&z80DF
zhD9sdGd<Q|X+}FUlI=aREZH-gyHcB{R5mYp$%n`X*q1S>><38YA#Y5c@|4>AdnA0Y
zsH%_u_3QuDEol$={)tfYUl8iTD0Av8Lg?f6?=V6)OhrxI&tzkJ<&titfVw$QwCzeN
zk=Whcjqi@f4Rbp&Ix{nqNRB1O#zsJ6#M;+wwl|_%mj`A&fDE@}Q>)mTp~nOu+cK*5
z&4Gaisv;kPR;p&ngH+@MFYz+hZ7VSv9|a&qPN{}jX7((rR7#r61YBZo#3~x{&MvF*
z5w*mu;*G?SqOh?wyToVHim}CG*%IH2O~lei_MUcKMJOvrj?NwnlL_m%Y?Kof(@?51
z_@n}qXMEg5Kvb$*CCw^wbGEAQ=*F(@X&rHej%;#f8z(hh@`Sv^^zAC!=Ccc{p7kN^
z`N(WOo8fY7EIABgbiD3{;ND1x>>kT@g98PeMa`|%v#V<(>*-u>bM1ZxIW17-6Q4}$
zzoi>!p8W8`4-dl<hypNtfj>X2YyI!Pe~ipSPka})Osh~Sv3+i$zjgez2_fL3W6V|*
z7baih<C>HAQ;$IBk;yI2Ou6`|j$jF90}ZzF_3KA;oLPR$hD7)mYS0N$ufTCG_EvK`
zlUc|VHr5Kcjr8I|)X>w4vSH+edMi^D&th4#Y_4<j^buy_Xe;rW9r7@1%(TLuX}Y9s
z>rM586wMMo1~=B$3(E`H4L=jYW=}6Cvl3r16dqg!59ZU$3nA+zD>85BHs7;XxLys`
zp{iO$K4P{OHHF`<Y9;%we%Iz@%V!#f9WEJ6;pSakHNq8UvNE^1X$97{o^aVFn$lck
z*4nPVZW<MC+WWnY20d!dbZ$H`mP}41wgj}M`xi{pFi)4OmL0PyT-H>LTQR%HW17-p
z=#8Wopc$3@ORv#-MWy8^b5NMRWXFjtrE(Qhvw7c1W~QFPdJG~hOoMV<JgIaSvSl*a
z)@r=2c<!Y91V~R^R&RooS7jk*whVVJY;k)-D|2{WB6Yp0t(B~hp)XnYMVJ?lVt~7>
z)!^2oj(3i)W@w5}hPs|w*aNS0R`R@4narCTCpY*ZR%2R;ZI!s+2Jd;-6Dy`0cFarX
zaLhLMV<mt$<AH*g>F5)y03A~DhzNA(JP=z<-T}E~8<j)3ASl?ds>PcQjRX}eK(VZ9
znK!>=*GZqiy&@)o7ki~{F%|seN<1dQy4myE3^dXcuxxO@?Dx*@I;Q#ZJWn8Lx*e#W
zeD*aub%|dt85W0B>bk!M?QTR&UN&lczNnRyGp{idVF#h-nZj%qk)dggvUfRJj$J3g
z2<1#`-FtofY13r;0gIb8ZU%GSl8X5%RjcS-H&ffH!aLg}02=#LtaX*!IWNpqJtIC1
zZd|j+Wp>r_S}MYHL*FkORjY5j14MwJ!!3kwoQBc)6U=x+9?w-}nOj!q@QnKV64$vM
zkV_goTwz0Bfgm#wWO#L9L%d!a4{{QG@8LuQzQEu~Q25@O8nCKcPz|4Wf&6cI39R>D
znJXF#6m~VmF8aNh7K&WkF4}?m(!y+;$;BfVtTMbVMNQuhimns+KkOfY-j{5LN7l4s
zwh<F_417t&noa~5H1yk>8AIn(u4f_uDFnpV6;fcFDHOJif^8HOu4=j_5(iF}DpJL;
zq{;D7X>vL#O^uI9Q`g3%>G7mAJw4?cP0mdCMrWpyzOieQlfLof_^5AuEIH#FpSqR|
z)ZdquS8jaMiO1p8kDijw6LQfA-V4<8(mxsc<3~<j0|zIjr#t+(lXM0;n>$YjFZeH?
zAzio|clUMocVFoq=zgPfurt~Ds8c0TOae3*3P++%%`NvS@lnZ738gqlNr?KIC~2Xj
zmHJLm(nd);^><LxNy!;Xx+pnINjD|uXy8007ehUm;+{}1%)PYrD#b&TjL=gFN=7Le
zqhykjDN3$UlA`1WB{wOaqa;nqJS7=QvJ@{;e20>|)W1T>T4){9!2M7TQ?g9STcJ3n
z(k5+thmw5gU0@by@G%W+(SS^eLfbhFZc|dEL5-3pl<ZJaqNGfN5sDwvwo2$dFfl2y
zD8bbCGr;;3*3V#k4&w_9KLZGS>4y<MM~0t9(79U(4cvyY0AmTEa|9%9<mo+pZjwBW
zi1}GW8n`zwU_X1jtqJSqDz5Fq*n_bT<9!$(!1xfxM=*X0<6{_4F-)I`=^6eK<JwnZ
z`*Vz!S3)6#qn&f;UNnkPSAE5c^_2|Hp*z5r`sdITtiGW+Gz+WWmqr8!y3<I)^imr6
zaPV>(`EjT>jRH7)F^wWP0>5#hcsYX+i8eJMjDsP`NiG6c!lCfQe<b&ulXQEWyU0E7
zsQ8<<4usqbPM)Yll^oTV^^>cuLEy!lSk{NHx|hI~NKz>L2Mor2PVxnu(f0xl8FKpp
zAs<i!DrG_UiXcL2NDZ@y`-YQ`E=3V*a<4jSQ??mhb%z|aMQv42J#G8m9eF<7lWm97
z!*EhO-!U9p>cEnld_LTJ$Q}juC67JfJXcS%PInU4Gpx&<&YyME?mm<~ORl=tz&}YM
z4gXTYzc|Xe*YiDUk9z)_wr)7#M*hO^c=iHBbF*%$c&4+9Zd#}fPdMtuYz)9|d*rmE
z_Il*JN6t9vC6CN_<aI~A?2%bPI%=1rc4qsC^$&OPpbxc2;k-NG`s~5Cp7TrKpASRs
zFF^X1A@?he+Fxr6f!ZqUvR5EA>wV}Bf<iX5a-g+wsP#Z-y#ZRAo>qW>)+S&*1g&>G
zE%<%xJ`!42K`ZaXSif6v)WKSt5IlyRCtx5LbY({!s<pL(KyhH39fqWEkPNv+51t|%
z4*LP#0>6VkDH2g%;Ctx97kC+e1niIUBg3mpBls=+H2%H&(}Ur4C|Fw?;C=iYL~kCb
ziElxiO#<#G_+U6E#O)w{hJ}3NKpj1le~R->YSVKz=6;6Zw2(w1k@KRxJ{PU_1%|3U
zI8evciEq8yeJPZ};8OHoLT+ykeh<Zd8`~Tml(De0-747pgrgEZGON8Lhaa}Xe+74U
z(S85j{`^#aP#s*F!o_~~gM7c*{{XRR_d~H$r{{v~8l3Ps7G!=>om6M$LgHos^Q$^D
zrKa*QhFSJH&fdV;n-K5U_}!uW?9wbM4!OU;`5|>Ee@nf^=G<S_iL{z#x7}aW2|&)y
zgVC=&@(RnizrpzhVU%3}_HQ9roJDvNMg0D7^iLw<9VfXtDElC2UE1Log68;nnQ;8~
zvh)H!MmsO?Hik(fJ8sG0xP;lFTZW7nj=EUSq2XkEp-J9z@^_Z*Am|4Z+QSRof(=AY
z*<F!aAR2Lp8*%>*0}pWe5KN7*Np=Zb{XG_)Bc%}Z$t^?%5WG(VC`#b%nQ@YU*2+=7
zO>Il&SJl;Ieob9V=GWErWd2R{&18N>UGb*3(RuGvTn39~sB}yFD}UDJ;L-j+<lX6S
Ds+1PF

diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as
index 29d5609ab..a6ade0085 100755
--- a/trunk/research/players/srs_player/src/srs_player.as
+++ b/trunk/research/players/srs_player/src/srs_player.as
@@ -104,7 +104,7 @@ package
             return 0;
         }
         
-        public function js_call_play(url:String, _width:int, _height:int):int {
+        public function js_call_play(url:String, _width:int, _height:int, _buffer_time:Number):int {
             this.url = url;
             trace("start to play url: " + this.url);
             
@@ -120,6 +120,7 @@ package
                 }
                 
                 stream = new NetStream(conn);
+                stream.bufferTime = _buffer_time;
                 stream.client = {};
                 stream.client.onMetaData = function(metadata:Object):void {
                     var customItems:Array = [new ContextMenuItem("SrsPlayer")];