From c319cc6a40cc07abbe0dc50d2af92c194a0b5648 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 12 Jul 2014 20:48:03 +0800 Subject: [PATCH] refine bandwidth test client, provides js and as library --- trunk/research/players/js/srs.bandwidth.js | 57 +- trunk/research/players/srs_bwt.html | 12 +- .../players/srs_bwt/release/srs_bwt.swf | Bin 4940 -> 6511 bytes .../srs_bwt/src/SrsClass/SrsElapsedTimer.as | 24 - .../srs_bwt/src/SrsClass/SrsSettings.as | 27 - .../players/srs_bwt/src/srs/SrsBandwidth.as | 502 ++++++++++++++++++ trunk/research/players/srs_bwt/src/srs_bwt.as | 361 ++++--------- trunk/src/app/srs_app_bandwidth.cpp | 37 +- trunk/src/app/srs_app_bandwidth.hpp | 8 +- trunk/src/app/srs_app_conn.cpp | 2 +- trunk/src/rtmp/srs_protocol_stack.cpp | 2 +- trunk/src/rtmp/srs_protocol_stack.hpp | 4 +- 12 files changed, 700 insertions(+), 336 deletions(-) delete mode 100755 trunk/research/players/srs_bwt/src/SrsClass/SrsElapsedTimer.as delete mode 100755 trunk/research/players/srs_bwt/src/SrsClass/SrsSettings.as create mode 100755 trunk/research/players/srs_bwt/src/srs/SrsBandwidth.as diff --git a/trunk/research/players/js/srs.bandwidth.js b/trunk/research/players/js/srs.bandwidth.js index 1b63b2ac8..759960ebe 100755 --- a/trunk/research/players/js/srs.bandwidth.js +++ b/trunk/research/players/js/srs.bandwidth.js @@ -27,6 +27,8 @@ function SrsBandwidth(container, width, height, private_object) { // the callback set data. this.percent = 0; this.status = ""; + this.report = ""; + this.server = ""; } /** * user can set some callback, then start the bandwidth. @@ -38,7 +40,7 @@ function SrsBandwidth(container, width, height, private_object) { * on_update_status(status:String):void, when srs bandwidth update the status. * status:String the human readable status text. */ -SrsBandwidth.prototype.start = function(url) { +SrsBandwidth.prototype.render = function(url) { if (url) { this.stream_url = url; } @@ -49,6 +51,8 @@ SrsBandwidth.prototype.start = function(url) { flashvars.on_bandwidth_ready = "__srs_on_bandwidth_ready"; flashvars.on_update_progress = "__srs_on_update_progress"; flashvars.on_update_status = "__srs_on_update_status"; + flashvars.on_srs_info = "__srs_on_srs_info"; + flashvars.on_complete = "__srs_on_complete"; var params = {}; params.wmode = "opaque"; @@ -75,7 +79,6 @@ SrsBandwidth.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%. */ SrsBandwidth.prototype.check_bandwidth = function(url) { this.stop(); @@ -107,6 +110,10 @@ SrsBandwidth.prototype.on_update_progress = function(percent) { } SrsBandwidth.prototype.on_update_status = function(status) { } +SrsBandwidth.prototype.on_srs_info = function(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip) { +} +SrsBandwidth.prototype.on_complete = function(start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time) { +} function __srs_find_bandwidth(id) { for (var i = 0; i < SrsBandwidth.__bandwidths.length; i++) { var bandwidth = SrsBandwidth.__bandwidths[i]; @@ -129,8 +136,52 @@ function __srs_on_update_progress(id, percent) { bandwidth.percent = percent; bandwidth.on_update_progress(percent); } -function __srs_on_update_status(id, status) { +function __srs_on_update_status(id, code, data) { var bandwidth = __srs_find_bandwidth(id); + + var status = ""; + switch(code){ + case "NetConnection.Connect.Failed": + status = "连接服务器失败！"; + break; + case "NetConnection.Connect.Rejected": + status = "服务器拒绝连接！"; + break; + case "NetConnection.Connect.Success": + status = "连接服务器成功!"; + break; + case "NetConnection.Connect.Closed": + if (bandwidth.report) { + return; + } + status = "连接已断开!"; + break; + case "srs.bwtc.play.start": + status = "开始测试下行带宽"; + break; + case "srs.bwtc.play.stop": + status = "下行带宽测试完毕，" + data + "kbps，开始测试上行带宽。"; + break; + default: + return; + } + bandwidth.status = status; bandwidth.on_update_status(status); +} +function __srs_on_srs_info(id, srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip) { + var bandwidth = __srs_find_bandwidth(id); + bandwidth.status = status; + bandwidth.server = srs_server_ip; + bandwidth.on_srs_info(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip); +} +function __srs_on_complete(id, start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time) { + var bandwidth = __srs_find_bandwidth(id); + + var status = "检测结束: " + bandwidth.server + " 上行: " + publish_kbps + " kbps" + " 下行: " + play_kbps + " kbps" + + " 测试时间: " + Number((end_time - start_time) / 1000).toFixed(1) + " 秒"; + bandwidth.report = status; + bandwidth.on_update_status(status); + + bandwidth.on_complete(start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time); } \ No newline at end of file diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index dc2593adb..25f41a1f6 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -35,6 +35,7 @@ function on_click_play() { $("#check_status").text(""); + $("#check_info").text(""); $("#progress_bar").width("0%"); $("#main_modal").modal({show:true, keyboard:false}); } @@ -61,7 +62,13 @@ bandwidth.on_update_status = function(status) { $("#check_status").text(status); } - bandwidth.start(url); + bandwidth.on_srs_info = function(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip) { + $("#check_info").text( + "server:" + srs_server + ", authors:" + srs_primary_authors + + ", srs_id:" + srs_id + ", srs_pid:" + srs_pid + ", ip:" + srs_server_ip + ); + } + bandwidth.render(url); } function on_stop_bandwidth_test() { bandwidth.stop(); @@ -112,7 +119,8 @@
- status +
status
+
info
diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf index c7fa90ebf79b88776730ad6971626e4ce64e306a..ca7d2213556e1a2c8cf8d387fe2682cba3befc0a 100755 GIT binary patch literal 6511 zcmV-#8Ia~fS5pp#EdT&`0kv8QbQ{Ncp4nYsumA~y7sNvcBvS`vhy=j{1g#4a30aDD zSd=YaFpFa$!U6#X2PwL7Lm#po-%(;Yz9q|coTQ19)VZCbuX#C|HU*{FIbZwQM2ga+ z;igSr+t)s`-|Q?%f|A_4_LcAL|IhyaKmYvm&p(UZZ+MI-|3HZIRYIC58LVw4guK80 zdz6sPxkPf{;9%HuY%HD058!Ug`q4sRe4w*)a&od`vb!UjJJQ(|3Cl) z6!M*29bIsghz}&Qxv^+rYjk`(or*`fyUt^q@}t@K(aGq9wkes8=0`VoE*SDYg;XJ} zZ4D)|G0hWBYsWl2p3p*n!&;bdz?jNbG2MvT#dwslW2 z?dkG+J$_$Tj|hWHH+S;vF3Pqk!2)h2PFJyc-~LSpLc_y{_a7W2r5dbq#owUoqP&^x zl;-BIxyHQdh~}$?bNL<7Oky&XD2&RGtFiK(C0{^N zEJG8hiYjBVJ2c+TJ41tmLxUrS_Kyr73hf$l=cn=oZEPf)8HpwmBZcgU(b0t)qwjSo zs54rw#vHZN*m<#&&4`fsyNm!iOwTe(Tto%@nj_1@6@*+!Rx;(Nsd)QB0)^yED5HYTgkq<_p;| zqg}J82NyIB9~?ga#aGXN>Z=z%_wdEnpFIDCSI!^*f-+vrkFGY0bfG{)!`+>JpRcbo z#=WO9j`+gxHStj`esp9$pXJjRSgYnj={Lymeo3ET-j*^2uwt2`yL8Bf#im z(cIKXv{)F;=JHl9OC^i~8c!vv`K_=XNsTuY$1$olV$NzL#gk`80J*|QAvLDivId9Kzc=*`&<7us+)hg1WN&HrnMzfIn+ja%9AT*Jo(9_*TZYblhBgUV!GhLZ{UE( zVcw14u4$>;a?;dtbOUs4>t&3}YIQi5KVUp}EumZvPq1NQ`we(p2gK$JiM==AVX)ji zKH#zO9;t*W0B>9B{&G99>EhR4xbWC37oL0c{6nYDKmFSImp^myjaO#hyt`>$bm8F> zzx>Mc!VU`ek{%ZxeB%5=FRpGn|K{}hk3K9Oc)$4K!xv9KA|8RQi*L;5;in$C@cNUp zZ$7eyZ+Gy@z7Ng!{rU7gOZ+bA;CJC>iC<>=b%|Kdf8nziPJR-DtX{rPD`10Wu$ZXv z4zt-2j;7LDV&&zP2Q~g&&=M;yuO2SO<9JlMhm8`)BJ7wf#QD-ekSjD^Mw}gQu9S)w z5W~Ld@|x`U6(Zl6&gQkme7T{_@{6~cRouBRoS8<7e)*LTU3mV*0guSsfXCwDc~WuD zmutXN;}Lnh@YLsj_0$`vq(U~FI;JHQ&o4iE;&Rnm-bKqsMvi3p&o;Jz@!UWhqgr}g z9?$0GfUoO7t}w>mKoi=;Kv%H4w-Yaf+m32eTe^GW!B~&aAMf%<1OA@A{=WV|uV3@` z2l|r%&8MxK7|rGjTlmw?*q9xtY5rO#_xJTGUH;yH(iQ0KQhIv&eM(P%Z&2w8qSfc~ z_bLHjpvx*A*ELHXpw$)6+S*H=%6?F-ggsN3R}+^W0Q z-DF$2OtOTUXbWxG(Xz8;uw|$vELBmN*;Kous@hrO+QlS=Q7e-fQ*2DOGwNV+6|=aQ zT*u^kW@%t@Ba_|Cx{S%qOm1P;R>oE^c@?7`Ca+<(s~Bx#@_Ht3V00ssuV%E1(E%n? zCU0i)7A9|H@-}rlRd-SKTB`1*>K>{NK)aX8`zVB!vkf!bA!fUQ*=}UE z!_0OQv)#;Ww=mnS%yt`-Z)fz6n2bS_Oum!Jf6V0fG5IdWj#Fm&FlEY<;3siCh3g{} z@2V2sE2{}@R8~(rNuxxh#^z>edhI&e*eXr8TX2UzY1+G~qtj<=Y&HL+X@7T5Z(pE4 zNE#y&X^g@{YhvC$E$q3k_ruphzX#|-M-1(FkkSv(hp53G5$sXH9uw?w!JZK8gMyt9 z>_hZv-u)SI_bjC=cc^wkRcSk3o+%mFPMRO4__KzHM5Trhu~B(hh^SO)2@yNBEDsR} zwKj!F6=f?zq?+3B*6pM#2Pu(Mdkvw~rphJXE=Xmn+PD5r)>oH&dP^xn_fRq_>1#^6 ziGEcnDW9xsAVhB~MU;dBRrOu5W-BNs(3iZSc}w^375wX`iJv zv_szr2N7G+mQef(ysf?CS8$Q@A7qfYNc=; z+;)}DM(g$NQn&%y9*iMVYPZ*5jO!xqq&vI};=K?nvTV1v&eFAH-z;56_rYL4H<&pa zZj##d12C~jlHJ}oOWVoy&>l3j;TDWB45ig-wc9&qsh1p@rJE>7hXm3ogZPv~=x~E@ zcP^&HEaByrcKt?lW2$Pm56)6QIXp|dDM*h5(kp}XDIft0NWT>%$PUBHO^dw5tT7g| zg;&_x^_$_#=9KJJ|0ThwujD(t@hznA8q%jx&-BVMs`qQOWHh#-kzAGZBv((b8I$yF z8r5i8N?tWl=O9EhkGoLxp5w>IWPQ7-Zd*{d&8rnXWUALLsMpS`E&2{qy>3ChZeDHG zcbe+;3+narYNijG>J1C(4fAT7zDuLt_Z%Nn^=r|%?)aEpe~(7D%hT;+4&-1T+6vlL zXkU-E1?_6I520;E+llsJv>DpG9BwToCH*$c-+`+NS2Zptt{Oc8D&tacFX3|Nl&BRAoGwC9>X5uGmGwCMw zX3|3(?WC7fwUa(l-A)3;*-rXNO*>I#Y%;#5;(RykCkZ_@zmEtHBAlO9WiBIcMm-$y4@>uN6*cxj?+ke zvOZ>wy7c=grc)&=s{IKW(|LgM`K%=mP`;}lp!$O}5}e_Qa($E#Reu<_-Z3L_k5Jc5 z6r#ttC}W5or>-F``XCo&4bche@^jILxoF%FJxN`wxacV^dhgj&-keD6N2rT&`7>Oe zH%yb$u5i*Ef-k573z(dMEXV=(!d^BWsE4 zQ9``O^heEm>beW}Q~DF;z2q80rw`ExP158R(MNXO4B1H`+bU#=YY4KZg>0LUSzKL^ zJtt(_h0N+&0snuZzi9eru4+Qo*YQwn{7JFaW|LbF&&}CB_s-mR-kJO9J9EE%XO7Oz zHP6j?=jI0I=AhHh@P(;X?5h1fUS}^G3*#p*V_~`}r#%vt^26{F?uS}dUodY+KcQ=xRtiia0n*%(^JRes{U~# zH>MiN{R9ujDdG1kSn?s7MvX+)B-i*NJCi$ok-_AkFEW%I@T1HsP2=2hgo}$2eZQJMhYT zrT6Z-rIzpZD(+q|7BA?+^A+FF8!uy@9S{5=Xc~H6GrTAZKps{=Rx$gEH2r^k3Sat# zf4PtM%YWuC!29ARxs;DxI%efVqGO7~li{8mUarBD{jbU-LkQ z32({xDqn`)!2i-qaR$#N&X%A6RppKxhT!X5IW(8n4jlu&lZmE{uZbi;1E-1Mm~u5b zfv?PHEUgJlq3MpiCzCCBjOlnih1`@U4WKO7;Q;En6H&&Z@uLb4_v%XqEQ1x7=A~hT z<1=Lx!31HdE52M+5m!bl*a7UApTbUoNeyLy69NoWLVLqLXVyT($}(Vy;^TBV8lqTt zatsN=T;TwA-VP4ZHC8IQ9R6A>rNcpT5ZbIM?Yq4ob6K5j7{e;)oM^k6v(UQc;|Ee@}zJiwOA zB^~QDzbJJ^9l_TEPTYINIaRJeWj&a%D*te=+%)AHuIy~qi?bXwKC{z>sKY>fMO)#R zg^Y<*@f33VLzrgIALzfL@-9hp?#~d3Wbr^rfF+@{k&}Oi( zS!S9WkUSp4BRC>Rq_y0dD+WG4w;CfWV%mI30$1!(Ik>STi?US}PvhLl{2ADAMJG!} zGY&ZZcjpQVCkd4&3>D`J{K)AKDd6(+M=`+W(P)1EWadCFi^G+|)c@ri<=xT8)$bOa zv5CvaJDaX(dAVN>^8o0|zd)BhCf*eb40Z#t>+%PcuI{cLrK`8Ad+|9#Z_wYf^vFx; z_x1KEe6f}OZol8s)f))*fcAF>IPLES4R&)$upg2>AJ_I_2u=e&P=6Pf`1@elhfzU$ z{Jos^b8T;bA821U*Y@@EUV(0m(iaGDc`(qY6!EOFbOms53)<6#P6!0%!R{d1!2lfi zeg1wwXm@YW;_u=i_`Cdpe$YT~z~cA&;nMH#?*r}b?uLC&pbwUPy$Iaj7wqnH1i@WoN}4yqodYMQEJRLxK|OVx3zzL%;wbSW@ic~i=@;|rv zw_=(jvbA;f4UO()P0h5yebw}8(y*40hD`)_JNVroT0Q%xhd{44=;7%h(r`1E-o{%R zZyn*S6mR9ZjrV<=-uNfecS#Ly_cTC7ncflMQQ(V=-b3%D2D?wNw94%hCE(ElA)q0K=d-^$Aym|vii`N7>T6|S|h&XB6mJq3-Yd407i>_-6ky^Tb zWr)<#4c#G94?s$xVd_>WAmy;+wgQco!?N2(sicGzw;i{%f!@jy=Z#l4B2%)`$srwy zEWe$4l~I5K7V5cO@>)lwS?rCr+hwn9RGy`(yy14mYadncp$?~t#rZpjz6t1b2gjs4 zA(dpOVtJiHe1vS(S0zDQjuS>Hy&b-DV7$5eZs&{R+AGHU{7f# zyo|O3mx2YdsaWb^@eC~VXK5+i1ep6duCmBbJHom>;WO8*4E^Y-e03f|`J(?12i)*H}Y2Vdvy*FO!u z-W$|E3%FXeQi=fxm{R+?No7`@qj)S6K<;}1UL4Qpuc@X9|xVcSM6iXcD-!djQM81X64byLf z?vlPE>ED)Sl3m5O_3wcDi$B!A%a`RnKnt$})Mc#B_qbp0UXPKnzmiIcG@!n4HzNB! zBC{Kj{S6;V#Wu3kVyKciR7uijxWcY5#qt@R;j^aZtP#XHBZwb>9+ck#9ai23J!JWj zq@Odx`hgkNTj0ILxT3#}Mqe>*(SIbhks>hRA4@T%jX0giz)z%@rOozIOgY09Ka(PX zn6=IRQaC`{?1t!XjY8`;>-+D-T%?FQW(~VBCFK3@F{KU0l>UK7?%);Ngus8!ll==L z6E}%WoacIgzlvo9`d^t7`xPb-rvC`KOZv5>|D!pLUz^kTC&R-n!o#c)P0)-+7tzQ@ zX8##sY&OF97d}k2f??7a=Jyz;jr?$yM##TnjN9qIfsRQ3F6sX&MF#c^km-T9^na7u z68X1XK)qG{KcpFN)WGNeT{`!T{14BaZM+D8^uLTa;;66{a=ZQxN*nuLL^8TrpW|aX zWh~lLe9@+H>^4h>$TXgGVR|>{F6kc7gYvzg!^(Z2hb;HY`rWdqrF+16E!_)lEZTi& z7>jnlEEeqnd4ACzlov1BL-Hky_J~{xZ$VW*CYRc7F>>;_jQDE!KDZj;J%RA_C*@Ld zGs=LU{GF5|TX7fOiV}Saod~A%H1FbaI26l&@+m!IPU#theg}OP^r-Y4Xj*(63F+puk(1K*CRJ`Wz^_4xuCJ9vG*h{jG{ho{gO zEXJ9B8jYc1+@`;TMz|PP^)qPfD#q>lD+pip)GtHyugWFk*v>d`Q)9N6J*?u;?KN1` zc!4}FUk6s zKSCV0 zDj8B+H+J}(+lHbstrcchED!5?qP3=GWMrgzq^>%i9IUBrX=$l(dulwMmB6u58;$Am zwv{n$>GIW7K!>6QlaYiTiN~Bopga&y=~paYZb}UWvqBT8WR!{w1#6V3GNi_OBggG>&=;~=^%4BtQFg{e1NXA2{An2rmD7tw15+Wjz8i+=;u##Mz zifxU>M`Dy~3QKr`Nk!J0LxFfK zAcsN$JszM79WbG5*F}IFQ<4Ry=o%9W%COE18J3fpb!c?G5=-Uxkxl!8a#UF#4=H(U z-%vy&%Gx%-mhIkkosyPeuv30-G%^^o_4o7!)^+;&Ei##k$#`71N8@rxNp{85xIG~! z=Htd?b_~mbIRdSZ^|(P?GxSVl!K(GS%BxSL1QJ8*2tqk*FStSvr%+c(QaT zrRh#Bp#&ppMA4jjSaC)|xl_KYbeGJ~ytOZpjOa?`Ok@W$i)jPV)#V8IY0*rkt{A8+ zL)eEE#yD>#eTIBO5IQBvL1w^WZ9wxBB3IP(|{ZcjYL9vH~>c|G+G1%z_NTW zQ7}&>LU0@ca99T+XEee!3+0&Nf|%S#GZ@MnC8jti!(Ac(TQjeX9E*Pom?{N}k=cAh`7d*Zc26FXiL6Dcj66P%K6*A%@! zGNeFF%rQ68BT=nrDmy_pYHn2~5g{hSU}5VN%k%^mhvSh@Vdpk*e@u?jFsO1+$v0hW z;w5=ljzr~wsAAC}OiK9{%^8d9PP&uJsV7IBQP?9{T^I;J5Q1B$oIeK?f;^7S#^-<* z?SLPUgIlcuI8E_HZibaiM6zhf*Bg`nA1dFDJeM4tI zImi8*`fTwSBVcn;L0?kqjLHd32@%gGZ7^?#r-LRbfTbu4?dPz(=!G*1M~P+&#oK95 z_p$VMt?%5JACFNK=^#*~#3c3QvrWkuJIi0zK0OIF&Jv8qHAN(zz>t?j!u+q3K$s-Z znrH?Gz?)3UqqOd7N^+POL_w>wmQR&fRt2#NAIUooQC-d%AQ}YdSll|0&;(FCm*g_x?}wbPny!&q z77yQZ?#S-x+O;|bm@Xj#0M4}M?yNnZj@`EO;>z`z8&ZEPoNZk^kx)We`@V7lr)#@p z_FB`|?2bppOWCVkwi;YyQSbB>J5wucm+HGxssK0P@_7S273JTuE*+#4}768jTF+Oi|Q-(=|5BsuEiKRYu~> zX}pUvA~T!M+R{$zUOw#l{az7D$P2C>%TX@Rb(UaW1d zYZg5%?iR7G!Q&R|J$3bBePdILSl{Gngs#~m);D_^plbwNi>F>}Xl`m0o9f*4^Jn^p z7N_h{6Pp^Fn@eYM5F(_k*z9g{&zni2SqNl$%*5teP^!7fU3aniH$4HxW?&UtYTZp2 zIr%dfTN-Mc#Fmz(hO(I(XQNu{_B1zIYTfX9YpJdEG}psLgM|U6^$m?yb~!GXbzRMy zakDM_%00Mj1|6PP?D{-E6WSoW8_tfe2yto_8k!nQET~K~;RY<+h=t8q@MGbd7|9p~F;XxZ#3+J=s5FG67?KttNk&o- zNf9IsB1r+Q;uzhGk%om^F!~lo-^S=W(sm?`Atdd9b_YUOxC{8c2km}nyP-V-xW|z6 zIMAPfHV$ncwEfTyKsyNS5Lx#!@V*J~ZD^;VeGKg^v|mB{HMCEleFhC-%Q=L_&jFr? z_64-xqcZkJUBIC#>*Zq(uIefnt@_4T7gu!?$5m~GnR|51fvTGSj`YRfMHJl5!1n=g zRX;$$RlJLiAEx6+>3A<4zW`&tDja?ZjU7fu5J-OojU7W=)vM$s-O5$HhS2NiM~H$S zGw=oj#~FBwffEe;gn@S$c$b0q71OLRp83z8DfnPH4FAV%E1HWP5-x&BU1HWV7QwAo`ABgS$&Srl^D5*&jhbpVv zIFy@99tE}q6i9t-To?(+ z-p^o;&CBs9cbS(HP~N3pPDJ@GFK0moUSJ2=jx`Jxb~0Gh!C-MagC#v)&WcJsUJj$O zRxf8mbGCXp36)2^oE^;_@^U$-;zlo*i{{0=TppUg*~{gl1#vG|fEM2516)(u>9e5~MhmRvMNzUpi(v7U zY4-)>;I6!Y3Q_w7RK)ifZ6L;PSM6$!oNIW=Bu~v#^W_4gJ*_&_LbYhD_>9qc%C*o} zf*vZegKVF_)U~9$6bVLG`jlEG&oR0ImdkUEs{vNX^Ne)>=gSL>9{am{Jf>0j(>sOnzK`<8%y8`G!drAEKMGOaGFV0*!A3b2s~! ztIO3(9xAGU&HerrF0XF|EWL>>3eiP@wZ;HpbFE3Mm-;RPF+n=*Osg(BRme20&P}Ux zd@F&h!Y-n~OLiT02@}6`abY8p_PIdKXxfju5f`pDhSF+vTCOo-0R3*&t=6Vh5Am`Q z2h2%d9Vnuu{q^1TT)4p)PWu}xL*0!i++>WT)h2(l+N`#u)mFM<8(@5wgZNR{+roo| zeX#c}VBxnw)^HJg12n!3Bi|Lk^PRL4w%-m*hKmY;FowwL)j+uw0jbIOE+86)X+Ul# zL*JD^y90q}s|aSjP2znoB8Js*_aWmx1bz>6FGkm*v9^zm`(cUKSzHW~ccGI&8i4sY zkZDvN1nL?_-A$<>m}jYbfZEQe4^yfN^DOmIpms3oW0V?(d6v2tsGW@ZIHhiZd6qhk z{7coPCuOIxj~Ie^L9#y~fFTE|Ar9^!G7cgCij%5OT}zYTDFkCz403b$(%~Y^ag=t| zaM1y<>}f(&uX4%0E;L+}2bgD2nxfS1u-ACbBnPwP=QHH1!)uJgCOMKNAIXr{g*%O- zCV4PReknsDFt{xKhR&=u`!KI9|p%uHZP= zu<@2TM~;;+A2EJn&UwcIm~S)QH|K%_ytTZDEEOH_4SAVpsI8Xr}tOjfZG6b%{cYKuTlC` zCBHx1Z~TS`wokGGXd+4&e2vplEy!gKwmQ7UK(4$)$o;5XN-G5O0{bba-Q_9 z6jm7b^29Y6ZGOOmHU%Vf_Y-aI2W`kx?0(Q;JK6<382A7H2;GAKAauI{KN={8vJ^mrwg{f^z#f(ab?YvmO*12gQti z#1b`7L{eZswd#kaix2YYs<7X9l83|452xZOGRU5ar-7H%_h*RELNQ0OPY`pTGtGSt zY#Kt(L;pD9UjXm~5)K0xN8%9x`;g^D0Q-^kD1ZY9zXaeQvb_x85R#7Z#`9qDS~yWJ z0Q@Gn;xIs&WbqLg43I2-5e7k$tw&)1KdoWoB^W5Fpv`z025KrO8OLBSm+;tQ-A(w*_ zL~Jp65LScOcc@snd%wdQ@0#)!5P4M8dqfmn^*&iu0`C|099Z=MiRXs|Rmvk|Ye~BS zS*mdUVzt=q*Hzu^PpK)le^?!M`$yCfw_j5=+Fj2rpnu^ctSANnCrb806(#rnKJ(*u z4GcP`eHG`(uXXTOQJ&#woy~FO-}2L2X7%N>R>MzmVh4QMl?If-NQ{gw$*|7eXtrt? zJ`IrtBKfZ4{MuCtv&Q_I^7VY?*LM2D$Y1?}QtPhArcl9C+nD)GFVr+c0m(d@kl4m@gu);(VD@iY#!6hSYZ2 zc}duJ6 0){ + kbps = bytes_delta * 8.0 / duration_delta; // b/ms == kbps + } + kbps = (int(kbps * 10))/10.0; + + flash.utils.setTimeout(stopPlayTest, 0); + __on_status_change(SrsBandwidth.StatusSrsBwtcPlayStop, String(kbps)); + + __on_progress_change(40); + } + private function stopPlayTest():void{ + connection.call("onSrsBandCheckStoppedPlayBytes", null); + } + /** + * publishing methods. + */ + private function onSrsBandCheckStartPublishBytes(evt:Object):void{ + var duration_ms:Number = evt.duration_ms; + var interval_ms:Number = evt.interval_ms; + + connection.call("onSrsBandCheckStartingPublishBytes", null); + + flash.utils.setTimeout(publisher, 0); + __on_status_change(SrsBandwidth.StatusSrsBwtcPublishStart); + + __on_progress_change(60); + } + private function publisher():void{ + var data:Array = new Array(); + + var data_size:int = 100; + for(var i:int; i < data_size; i++) { + data.push("SrS band check data from client's publishing......"); + } + + connection.call("onSrsBandCheckPublishing", null, data); + + publish_timeout_handler = flash.utils.setTimeout(publisher, 0); + } + private function onSrsBandCheckStopPublishBytes(evt:Object):void{ + var duration_ms:Number = evt.duration_ms; + var interval_ms:Number = evt.interval_ms; + var duration_delta:Number = evt.duration_delta; + var bytes_delta:Number = evt.bytes_delta; + + var kbps:Number = 0; + if(duration_delta > 0){ + kbps = bytes_delta * 8.0 / duration_delta; // b/ms == kbps + } + kbps = (int(kbps * 10))/10.0; + + stopPublishTest(); + + __on_progress_change(90); + } + private function stopPublishTest():void{ + // the stop publish response packet can not send out, for the queue is full. + //connection.call("onSrsBandCheckStoppedPublishBytes", null); + + // clear the timeout to stop the send loop. + if (publish_timeout_handler > 0) { + flash.utils.clearTimeout(publish_timeout_handler); + publish_timeout_handler = 0; + } + } + private function onSrsBandCheckFinished(evt:Object):void{ + var code:Number = evt.code; + var start_time:Number = evt.start_time; + var end_time:Number = evt.end_time; + var play_kbps:Number = evt.play_kbps; + var publish_kbps:Number = evt.publish_kbps; + var play_bytes:Number = evt.play_bytes; + var play_time:Number = evt.play_time; + var publish_bytes:Number = evt.publish_bytes; + var publish_time:Number = evt.publish_time; + + if (this.as_on_complete != null) { + this.as_on_complete(start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time); + } + if (this.js_on_complete != null) { + flash.external.ExternalInterface.call(this.js_on_complete, this.js_id, + start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time); + } + + __on_progress_change(100); + + // when got finish packet, directly close connection. + js_call_stop(); + + // the last final packet can not send out, for the queue is full. + //connection.call("finalClientPacket", null); + } + + /** + * get NetConnection NetStatusEvent + */ + private function onStatus(evt:NetStatusEvent): void { + trace(evt.info.code); + + if (evt.info.hasOwnProperty("data") && evt.info.data) { + if (evt.info.data.hasOwnProperty("srs_server")) { + srs_server = evt.info.data.srs_server; + } + if (evt.info.data.hasOwnProperty("srs_primary_authors")) { + srs_primary_authors = evt.info.data.srs_primary_authors; + } + if (evt.info.data.hasOwnProperty("srs_id")) { + srs_id = evt.info.data.srs_id; + } + if (evt.info.data.hasOwnProperty("srs_pid")) { + srs_pid = evt.info.data.srs_pid; + } + if (evt.info.data.hasOwnProperty("srs_server_ip")) { + srs_server_ip = evt.info.data.srs_server_ip; + } + + if (this.as_on_srs_info != null) { + this.as_on_srs_info(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip); + } + if (this.js_on_srs_info != null) { + flash.external.ExternalInterface.call(this.js_on_srs_info, this.js_id, + srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip); + } + } + if (evt.info.code) { + __on_status_change(evt.info.code); + } + switch(evt.info.code){ + case "NetConnection.Connect.Success": + __on_progress_change(8); + break; + } + + } + + /** + * invoke the callback. + */ + private function __on_progress_change(percent:Number):void { + if (this.as_on_progress_change != null) { + this.as_on_progress_change(percent); + } + if (this.js_on_progress_change != null) { + flash.external.ExternalInterface.call(this.js_on_progress_change, this.js_id, + percent); + } + } + private function __on_status_change(code:String, data:String=""):void { + if (this.as_on_status_change != null) { + this.as_on_status_change(code, data); + } + if (this.js_on_status_change != null) { + flash.external.ExternalInterface.call(this.js_on_status_change, this.js_id, + code, data); + } + } + } +} \ No newline at end of file diff --git a/trunk/research/players/srs_bwt/src/srs_bwt.as b/trunk/research/players/srs_bwt/src/srs_bwt.as index af6af5546..98ae09c99 100755 --- a/trunk/research/players/srs_bwt/src/srs_bwt.as +++ b/trunk/research/players/srs_bwt/src/srs_bwt.as @@ -1,7 +1,5 @@ package { - import SrsClass.SrsElapsedTimer; - import flash.display.LoaderInfo; import flash.display.Sprite; import flash.display.StageAlign; @@ -17,35 +15,20 @@ package import flash.ui.ContextMenuItem; import flash.utils.Timer; import flash.utils.setTimeout; + + import srs.SrsBandwidth; public class srs_bwt extends Sprite - { - private var connection:NetConnection = null; - - private var updatePlayProgressTimer:Timer = null; - private var elapTimer:SrsElapsedTimer = null; + { + /** + * the SRS bandwidth check/test library object. + */ + private var bandwidth:SrsBandwidth = new SrsBandwidth(); - // user set id. - private var js_id:String = null; - // play param url. - private var user_url:String = null; - - // server ip get from server - private var server_ip:String; - - // test wheth publish should to stop - private var stop_pub:Boolean = false; - - // js interface - private var js_on_player_ready:String; - private var js_update_progress:String; - private var js_update_status:String; - - private var value_progressbar:Number = 0; - private var max_progressbar:Number = 0; - - // set NetConnection ObjectEncoding to AMF0 - NetConnection.defaultObjectEncoding = ObjectEncoding.AMF0; + /** + * when not specifies any param, directly run the swf. + */ + private var default_url:String = "rtmp://dev:1935/app?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com"; public function srs_bwt() { @@ -55,91 +38,81 @@ package this.system_on_add_to_stage(null); } } - - /** - * system event callback, when this control added to stage. - * the main function. - */ private function system_on_add_to_stage(evt:Event):void { this.stage.scaleMode = StageScaleMode.NO_SCALE; this.stage.align = StageAlign.TOP_LEFT; - - var flashvars:Object = this.root.loaderInfo.parameters; - if (!flashvars.hasOwnProperty("id")) { - throw new Error("must specifies the id"); - } + // init context menu + var myMenu:ContextMenu = new ContextMenu(); + myMenu.hideBuiltInItems(); + myMenu.customItems.push(new ContextMenuItem("SRS带宽测试工具", true)); + this.contextMenu = myMenu; - this.js_id = flashvars.id; - this.js_on_player_ready = flashvars.on_bandwidth_ready; - this.js_update_progress = flashvars.on_update_progress; - this.js_update_status = flashvars.on_update_status; - - // init context menu - var myMenu:ContextMenu = new ContextMenu(); - myMenu.hideBuiltInItems(); - myMenu.customItems.push(new ContextMenuItem("SRS 带宽测试工具", true)); - this.contextMenu = myMenu; - - flash.utils.setTimeout(this.system_on_js_ready, 0); + check_bandwidth(); } - /** - * system callack event, when js ready, register callback for js. - * the actual main function. - */ - private function system_on_js_ready():void { - if (!flash.external.ExternalInterface.available) { - trace("js not ready, try later."); - flash.utils.setTimeout(this.system_on_js_ready, 100); - return; - } - - flash.external.ExternalInterface.addCallback("__check_bandwidth", this.js_call_check_bandwidth); - flash.external.ExternalInterface.addCallback("__stop", this.js_call_stop); - - flash.external.ExternalInterface.call(this.js_on_player_ready, this.js_id); - } - - private function js_call_check_bandwidth(url:String):void { - js_call_stop(); - - // init connection - connection = new NetConnection; - connection.client = this; - connection.addEventListener(NetStatusEvent.NET_STATUS, onStatus); - connection.connect(url); - //connection.connect("rtmp://192.168.8.234:1935/app?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com"); + private function check_bandwidth():void { + // closure + var self:srs_bwt = this; - // for play to update progress bar - elapTimer = new SrsElapsedTimer; - - // we suppose the check time = 7 S - updatePlayProgressTimer = new Timer(100); - updatePlayProgressTimer.addEventListener(TimerEvent.TIMER, onTimerTimeout); - updatePlayProgressTimer.start(); - } - private function js_call_stop():void { - if (connection) { - connection.close(); - connection = null; - } - if (updatePlayProgressTimer) { - updatePlayProgressTimer.stop(); - updatePlayProgressTimer = null; - } - if (elapTimer) { - elapTimer.restart(); - } + ///////////////////////////////////////////////////////////////////// + // initialize the bandwidth check/test library + ///////////////////////////////////////////////////////////////////// + // js callback, set to null if ignore. + var conf:Object = this.root.loaderInfo.parameters; + var js_id:String = conf.id? conf.id:null; + var js_on_ready:String = conf.on_bandwidth_ready? conf.on_bandwidth_ready:null; + var js_on_srs_info:String = conf.on_srs_info? conf.on_srs_info:null; + var js_on_progress_change:String = conf.on_update_progress? conf.on_update_progress:null; + var js_on_status_change:String = conf.on_update_status? conf.on_update_status:null; + var js_on_complete:String = conf.on_complete? conf.on_complete:null; + + // js export, set to null to disable + var js_export_check_bandwidth:String = "__check_bandwidth"; + var js_export_stop:String = "__stop"; + + // as callback, set to null if ignore. + var as_on_ready:Function = function():void { + self.on_ready(); + }; + var as_on_status_change:Function = function(code:String, data:String):void { + self.on_status_change(code, data); + }; + var as_on_progress_change:Function = function(percent:Number):void { + self.on_progress(percent); + }; + var as_on_srs_info:Function = function(srs_server:String, srs_primary_authors:String, srs_id:String, srs_pid:String, srs_server_ip:String):void { + self.update_context_items(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip); + }; + var as_on_complete:Function = function(start_time:Number, end_time:Number, play_kbps:Number, publish_kbps:Number, play_bytes:Number, publish_bytes:Number, play_time:Number, publish_time:Number):void { + self.on_complete(start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time); + }; + + bandwidth.initialize( + as_on_ready, as_on_status_change, as_on_progress_change, as_on_srs_info, as_on_complete, + js_id, js_on_ready, js_on_status_change, js_on_progress_change, js_on_srs_info, js_on_complete, + js_export_check_bandwidth, js_export_stop + ); + ///////////////////////////////////////////////////////////////////// } - // srs infos - private var srs_server:String = null; - private var srs_primary_authors:String = null; - private var srs_id:String = null; - private var srs_pid:String = null; - private var srs_server_ip:String = null; - private function update_context_items():void { + private function on_ready():void { + var conf:Object = this.root.loaderInfo.parameters; + + // for directly run swf. + if (!conf.id) { + trace("directly run swf, load default url: " + this.default_url); + this.bandwidth.check_bandwidth(this.default_url); + } + + } + private function on_progress(percent:Number):void { + trace("progress:" + percent + "%"); + } + private function update_context_items( + srs_server:String, srs_primary_authors:String, + srs_id:String, srs_pid:String, srs_server_ip:String + ):void { // for context menu var customItems:Array = [new ContextMenuItem("SrsPlayer")]; if (srs_server != null) { @@ -159,172 +132,42 @@ package } contextMenu.customItems = customItems; } - - // get NetConnection NetStatusEvent - public function onStatus(evt:NetStatusEvent) : void{ - trace(evt.info.code); - - if (evt.info.hasOwnProperty("data") && evt.info.data) { - if (evt.info.data.hasOwnProperty("srs_server")) { - srs_server = evt.info.data.srs_server; - } - if (evt.info.data.hasOwnProperty("srs_primary_authors")) { - srs_primary_authors = evt.info.data.srs_primary_authors; - } - if (evt.info.data.hasOwnProperty("srs_id")) { - srs_id = evt.info.data.srs_id; - } - if (evt.info.data.hasOwnProperty("srs_pid")) { - srs_pid = evt.info.data.srs_pid; - } - if (evt.info.data.hasOwnProperty("srs_server_ip")) { - srs_server_ip = evt.info.data.srs_server_ip; - } - update_context_items(); - } - - switch(evt.info.code){ + public function on_status_change(code:String, data:String): void { + trace(code); + switch(code){ case "NetConnection.Connect.Failed": - updateState("连接服务器失败！"); + trace("连接服务器失败！"); break; case "NetConnection.Connect.Rejected": - updateState("服务器拒绝连接！"); + trace("服务器拒绝连接！"); break; case "NetConnection.Connect.Success": - server_ip = evt.info.data.srs_server_ip; - updateState("连接服务器成功!"); + trace("连接服务器成功!"); break; + case SrsBandwidth.StatusSrsBwtcPlayStart: + trace("开始测试下行带宽"); + break; + case SrsBandwidth.StatusSrsBwtcPlayStop: + trace("下行带宽测试完毕，" + data + "kbps，开始测试上行带宽。"); + break; + case SrsBandwidth.StatusSrsBwtcPublishStart: + trace("开始测试上行带宽"); + break; + case SrsBandwidth.StatusSrsBwtcPublishStop: + trace("上行带宽测试完毕，" + data + "kbps，"); + break; case "NetConnection.Connect.Closed": - //updateState("连接已断开!"); + trace("连接已断开!"); break; } } - - public function onTimerTimeout(evt:TimerEvent):void - { - value_progressbar = elapTimer.elapsed(); - updateProgess(value_progressbar, max_progressbar); - } - - /** - * NetConnection callback this function, when recv server call "onSrsBandCheckStartPlayBytes" - * then start @updatePlayProgressTimer for updating the progressbar - * */ - public function onSrsBandCheckStartPlayBytes(evt:Object):void{ - var duration_ms:Number = evt.duration_ms; - var interval_ms:Number = evt.interval_ms; - - connection.call("onSrsBandCheckStartingPlayBytes", null); - updateState("开始测试下行带宽，服务器IP：" + server_ip); - - // we suppose play duration_ms = pub duration_ms - max_progressbar = duration_ms * 2; - } - - public function onSrsBandCheckPlaying(evt:Object):void{ - } - - public function onSrsBandCheckStopPlayBytes(evt:Object):void{ - var duration_ms:Number = evt.duration_ms; - var interval_ms:Number = evt.interval_ms; - var duration_delta:Number = evt.duration_delta; - var bytes_delta:Number = evt.bytes_delta; - - var kbps:Number = 0; - if(duration_delta > 0){ - kbps = bytes_delta * 8.0 / duration_delta; // b/ms == kbps - } - kbps = (int(kbps * 10))/10.0; - - flash.utils.setTimeout(stopPlayTest, 0); - updateState("下行带宽测试完毕，服务器: " + server_ip + "，" + kbps + "kbps，开始测试上行带宽。"); - } - - private function stopPlayTest():void{ - connection.call("onSrsBandCheckStoppedPlayBytes", null); - } - - public function onSrsBandCheckStartPublishBytes(evt:Object):void{ - var duration_ms:Number = evt.duration_ms; - var interval_ms:Number = evt.interval_ms; - - connection.call("onSrsBandCheckStartingPublishBytes", null); - - flash.utils.setTimeout(publisher, 0); - } - - private function publisher():void{ - if (stop_pub) { - return; - } - - var data:Array = new Array(); - - var data_size:int = 100; - for(var i:int; i < data_size; i++){ - data.push("SrS band check data from client's publishing......"); - } - data_size += 100; - connection.call("onSrsBandCheckPublishing", null, data); - - flash.utils.setTimeout(publisher, 0); - } - - public function onSrsBandCheckStopPublishBytes(evt:Object):void{ - var duration_ms:Number = evt.duration_ms; - var interval_ms:Number = evt.interval_ms; - var duration_delta:Number = evt.duration_delta; - var bytes_delta:Number = evt.bytes_delta; - - var kbps:Number = 0; - if(duration_delta > 0){ - kbps = bytes_delta * 8.0 / duration_delta; // b/ms == kbps - } - kbps = (int(kbps * 10))/10.0; - - stopPublishTest(); - } - - private function stopPublishTest():void{ - if(connection.connected){ - connection.call("onSrsBandCheckStoppedPublishBytes", null); - } - stop_pub = true; - - value_progressbar = max_progressbar; - updateProgess(value_progressbar, max_progressbar); - updatePlayProgressTimer.stop(); - } - - public function onSrsBandCheckFinished(evt:Object):void{ - var code:Number = evt.code; - var start_time:Number = evt.start_time; - var end_time:Number = evt.end_time; - var play_kbps:Number = evt.play_kbps; - var publish_kbps:Number = evt.publish_kbps; - var play_bytes:Number = evt.play_bytes; - var play_time:Number = evt.play_time; - var publish_bytes:Number = evt.publish_bytes; - var publish_time:Number = evt.publish_time; - - updateState("检测结束: 服务器: " + server_ip + " 上行: " + publish_kbps + " kbps" + " 下行: " + play_kbps + " kbps" - + " 测试时间: " + (end_time-start_time)/1000 + " 秒"); - connection.call("finalClientPacket", null); - } - - // 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); - trace(value + "-" + maxValue + "-" + value * 100 / maxValue + "%"); - } - - // update checking status - private function updateState(text:String):void{ - flash.external.ExternalInterface.call(this.js_update_status, this.js_id, text); - trace(text); - } - - public function onBWDone():void{ + private function on_complete( + start_time:Number, end_time:Number, play_kbps:Number, publish_kbps:Number, + play_bytes:Number, publish_bytes:Number, play_time:Number, publish_time:Number + ):void { + var status:String = "检测结束: 上行: " + publish_kbps + " kbps" + " 下行: " + play_kbps + " kbps" + + " 测试时间: " + Number((end_time - start_time) / 1000).toFixed(1) + " 秒"; + trace(status); } } } \ No newline at end of file diff --git a/trunk/src/app/srs_app_bandwidth.cpp b/trunk/src/app/srs_app_bandwidth.cpp index abcb86a00..e0718cd04 100644 --- a/trunk/src/app/srs_app_bandwidth.cpp +++ b/trunk/src/app/srs_app_bandwidth.cpp @@ -115,19 +115,23 @@ int SrsBandwidth::do_bandwidth_check() int64_t start_time = srs_get_system_time_ms(); + srs_info("start play test."); ret = check_play(play_duration_ms, play_interval_ms, play_actual_duration_ms, play_bytes, limit_kbps); if (ret != ERROR_SUCCESS) { srs_error("band width play check failed. ret=%d", ret); return ret; } + srs_info("stop play test."); + srs_info("start publish test."); ret = check_publish(publish_duration_ms, publish_interval_ms, publish_actual_duration_ms, publish_bytes, limit_kbps); if (ret != ERROR_SUCCESS) { srs_error("band width publish check failed. ret=%d", ret); return ret; } + srs_info("stop publish test."); int64_t end_time = srs_get_system_time_ms(); int play_kbps = play_bytes * 8 / play_actual_duration_ms; @@ -138,7 +142,9 @@ int SrsBandwidth::do_bandwidth_check() start_time, end_time, (int)(end_time - start_time), play_kbps, publish_kbps, _req->tcUrl.c_str(), ret); - // send finished msg + // send finished msg, + // flash client will close connection when got this packet, + // for the publish queue may contains packets. SrsBandwidthPacket* pkt = SrsBandwidthPacket::create_finish(); pkt->data->set("code", SrsAmf0Any::number(ERROR_SUCCESS)); pkt->data->set("start_time", SrsAmf0Any::number(start_time)); @@ -154,9 +160,12 @@ int SrsBandwidth::do_bandwidth_check() srs_error("send bandwidth check finish message failed. ret=%d", ret); return ret; } + srs_info("send finish packet."); - // if flash, we notice the result, and expect a final packet. - while (true) { + // we notice the result, and expect a final packet if not flash. + // if flash client, client will disconnect when got finish packet. + bool is_flash = (_req->swfUrl != ""); + while (!is_flash) { SrsMessage* msg = NULL; SrsBandwidthPacket* pkt = NULL; if ((ret = _rtmp->expect_message(&msg, &pkt)) != ERROR_SUCCESS) { @@ -196,8 +205,8 @@ int SrsBandwidth::check_play( srs_error("send bandwidth check start play message failed. ret=%d", ret); return ret; } - srs_info("BW check begin."); } + srs_info("BW check begin."); while (true) { // recv client's starting play response @@ -212,10 +221,10 @@ int SrsBandwidth::check_play( srs_info("get bandwidth message succes."); if (pkt->is_starting_play()) { - srs_info("BW check recv play begin response."); break; } } + srs_info("BW check recv play begin response."); // send play data to client int64_t current_time = srs_get_system_time_ms(); @@ -277,8 +286,8 @@ int SrsBandwidth::check_play( srs_error("send bandwidth check stop play message failed. ret=%d", ret); return ret; } - srs_info("BW check stop play bytes."); } + srs_info("BW check stop play bytes."); while (true) { // recv client's stop play response. @@ -293,10 +302,10 @@ int SrsBandwidth::check_play( srs_info("get bandwidth message succes."); if (pkt->is_stopped_play()) { - srs_info("BW check recv stop play response."); break; } } + srs_info("BW check recv stop play response."); return ret; } @@ -318,8 +327,8 @@ int SrsBandwidth::check_publish( srs_error("send bandwidth check start publish message failed. ret=%d", ret); return ret; } - srs_info("BW check publish begin."); } + srs_info("BW check publish begin."); while (true) { // read client's notification of starting publish @@ -334,14 +343,14 @@ int SrsBandwidth::check_publish( srs_info("get bandwidth message succes."); if (pkt->is_starting_publish()) { - srs_info("BW check recv publish begin response."); break; } } + srs_info("BW check recv publish begin response."); // recv publish msgs until @duration_ms ms int64_t current_time = srs_get_system_time_ms(); - while ( (srs_get_system_time_ms() - current_time) < duration_ms ) { + while ((srs_get_system_time_ms() - current_time) < duration_ms) { st_usleep(0); SrsMessage* msg = NULL; @@ -380,16 +389,16 @@ int SrsBandwidth::check_publish( srs_error("send bandwidth check stop publish message failed. ret=%d", ret); return ret; } - srs_info("BW check stop publish bytes."); } + srs_info("BW check stop publish bytes."); // expect client to stop publish // if flash client, we never expect the client stop publish bytes, // for the flash send call packet to test publish bandwidth, // there are many many packets in the queue. // we just ignore the packet and send the bandwidth test data. - // TODO: FIXME: check whether flash client. - while (false) { + bool is_flash = (_req->swfUrl != ""); + while (!is_flash) { // recv client's stop publish response. SrsMessage* msg = NULL; SrsBandwidthPacket* pkt = NULL; @@ -402,10 +411,10 @@ int SrsBandwidth::check_publish( srs_info("get bandwidth message succes."); if (pkt->is_stopped_publish()) { - srs_info("BW check recv stop publish response."); break; } } + srs_info("BW check recv stop publish response."); return ret; } diff --git a/trunk/src/app/srs_app_bandwidth.hpp b/trunk/src/app/srs_app_bandwidth.hpp index 3f46f29dc..91453859b 100644 --- a/trunk/src/app/srs_app_bandwidth.hpp +++ b/trunk/src/app/srs_app_bandwidth.hpp @@ -67,10 +67,10 @@ class SrsRtmpServer; * | final(2)------------> | finalClientPacket * | | * -* 1. when flash client, server ignore the publish stopped result, -* and directly send the report to flash client. -* 2. flash client only. when got report, flash client should send out -* a final packet and close the connection immediately. +* 1. when flash client, server never wait the stop publish response, +* for the flash client queue is fullfill with other packets. +* 2. when flash client, server never wait the final packet, +* for the flash client directly close when got report packet. */ class SrsBandwidth { diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index 5f595b14d..7a1e014fa 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -69,7 +69,7 @@ int SrsConnection::cycle() // success. if (ret == ERROR_SUCCESS) { - srs_trace("client process normally finished. ret=%d", ret); + srs_trace("client finished."); } // client close peer. diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/rtmp/srs_protocol_stack.cpp index f4cb33fe5..62b87d6a8 100644 --- a/trunk/src/rtmp/srs_protocol_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_stack.cpp @@ -720,7 +720,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, *ppacket = packet = new SrsSetChunkSizePacket(); return packet->decode(stream); } else { - if (!header.is_set_peer_bandwidth()) { + if (!header.is_set_peer_bandwidth() && !header.is_ackledgement()) { srs_trace("drop unknown message, type=%d", header.message_type); } } diff --git a/trunk/src/rtmp/srs_protocol_stack.hpp b/trunk/src/rtmp/srs_protocol_stack.hpp index ddf55ecb7..adfe81aac 100644 --- a/trunk/src/rtmp/srs_protocol_stack.hpp +++ b/trunk/src/rtmp/srs_protocol_stack.hpp @@ -223,7 +223,9 @@ public: while (true) { SrsMessage* msg = NULL; if ((ret = recv_message(&msg)) != ERROR_SUCCESS) { - srs_error("recv message failed. ret=%d", ret); + if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { + srs_error("recv message failed. ret=%d", ret); + } return ret; } srs_verbose("recv message success.");