From 5ff1ce7cba2c1f9f6f51453f2e9136cf0b0485c4 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 27 May 2014 15:34:55 +0800 Subject: [PATCH] for bug #87, response the server SrsId to flash. --- trunk/research/players/js/srs.page.js | 2 +- .../players/srs_bwt/release/srs_bwt.swf | Bin 4674 -> 4840 bytes trunk/research/players/srs_bwt/src/srs_bwt.as | 30 +++++++++-- .../players/srs_player/release/srs_player.swf | Bin 5360 -> 5454 bytes .../players/srs_player/src/srs_player.as | 50 ++++++++++-------- .../srs_publisher/release/srs_publisher.swf | Bin 5306 -> 5470 bytes .../srs_publisher/src/srs_publisher.as | 30 +++++++++-- trunk/src/core/srs_core.hpp | 2 +- trunk/src/rtmp/srs_protocol_rtmp.cpp | 2 + 9 files changed, 83 insertions(+), 33 deletions(-) diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 042b6a119..5b690c1ca 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////////////////// // to query the swf anti cache. -function srs_get_version_code() { return "1.20"; } +function srs_get_version_code() { return "1.21"; } /** * player specified size. diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf index 6b68b051a350b678e375aa1c5788cc0c921d1933..f035aa6fff27d066a4b4d6dbd5eade9475dc4052 100755 GIT binary patch literal 4840 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 O1)p@``2PT=mZR2wregX4 literal 4674 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 diff --git a/trunk/research/players/srs_bwt/src/srs_bwt.as b/trunk/research/players/srs_bwt/src/srs_bwt.as index bb12e965d..2a671faf9 100755 --- a/trunk/research/players/srs_bwt/src/srs_bwt.as +++ b/trunk/research/players/srs_bwt/src/srs_bwt.as @@ -132,21 +132,41 @@ package elapTimer.restart(); } } + + // srs infos + private var srs_server:String = null; + private var srs_primary_authors:String = null; + private var srs_id:String = null; + private function update_context_items():void { + // for context menu + var customItems:Array = [new ContextMenuItem("SrsPlayer")]; + if (srs_server != null) { + customItems.push(new ContextMenuItem("Server: " + srs_server)); + } + if (srs_primary_authors != null) { + customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary_authors)); + } + if (srs_id != null) { + customItems.push(new ContextMenuItem("SrsId: " + srs_id)); + } + contextMenu.customItems = customItems; + } // get NetConnection NetStatusEvent public function onStatus(evt:NetStatusEvent) : void{ trace(evt.info.code); if (evt.info.hasOwnProperty("data") && evt.info.data) { - // for context menu - var customItems:Array = [new ContextMenuItem("SrsPlayer")]; if (evt.info.data.hasOwnProperty("srs_server")) { - customItems.push(new ContextMenuItem("Server: " + evt.info.data.srs_server)); + srs_server = evt.info.data.srs_server; } if (evt.info.data.hasOwnProperty("srs_primary_authors")) { - customItems.push(new ContextMenuItem("PrimaryAuthors: " + evt.info.data.srs_primary_authors)); + srs_primary_authors = evt.info.data.srs_primary_authors; } - contextMenu.customItems = customItems; + if (evt.info.data.hasOwnProperty("srs_id")) { + srs_id = evt.info.data.srs_id; + } + update_context_items(); } switch(evt.info.code){ diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf index 159bcf3546dfe09c58cd500cac253cf58d0458ce..3402953c93a9d559010b731e3c90f327138057b4 100755 GIT binary patch literal 5454 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 Em@S>Jq5uE@ literal 5360 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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 9640f387e..781917176 100755 --- a/trunk/research/players/srs_player/src/srs_player.as +++ b/trunk/research/players/srs_player/src/srs_player.as @@ -143,29 +143,17 @@ package private function system_on_metadata(metadata:Object):void { this.media_metadata = metadata; - if (metadata.hasOwnProperty("server")) { - // for context menu - var customItems:Array = [new ContextMenuItem("SrsPlayer")]; - if (metadata.hasOwnProperty("server")) { - customItems.push(new ContextMenuItem("Server: " + metadata.server)); - } - if (metadata.hasOwnProperty("contributor")) { - customItems.push(new ContextMenuItem("Contributor: " + metadata.contributor)); - } - contextMenu.customItems = customItems; - } - // for js. var obj:Object = __get_video_size_object(); obj.server = 'srs'; obj.contributor = 'winlin'; - if (metadata.hasOwnProperty("server")) { - obj.server = metadata.server; + if (srs_server != null) { + obj.server = srs_server; } - if (metadata.hasOwnProperty("contributor")) { - obj.contributor = metadata.contributor; + if (srs_primary_authors != null) { + obj.contributor = srs_primary_authors; } var code:int = flash.external.ExternalInterface.call(js_on_player_metadata, js_id, obj); @@ -277,6 +265,25 @@ package } } + // srs infos + private var srs_server:String = null; + private var srs_primary_authors:String = null; + private var srs_id:String = null; + private function update_context_items():void { + // for context menu + var customItems:Array = [new ContextMenuItem("SrsPlayer")]; + if (srs_server != null) { + customItems.push(new ContextMenuItem("Server: " + srs_server)); + } + if (srs_primary_authors != null) { + customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary_authors)); + } + if (srs_id != null) { + customItems.push(new ContextMenuItem("SrsId: " + srs_id)); + } + contextMenu.customItems = customItems; + } + /** * function for js to call: to play the stream. stop then play. * @param url, the rtmp/http url to play. @@ -300,15 +307,16 @@ package trace ("NetConnection: code=" + evt.info.code); if (evt.info.hasOwnProperty("data") && evt.info.data) { - // for context menu - var customItems:Array = [new ContextMenuItem("SrsPlayer")]; if (evt.info.data.hasOwnProperty("srs_server")) { - customItems.push(new ContextMenuItem("Server: " + evt.info.data.srs_server)); + srs_server = evt.info.data.srs_server; } if (evt.info.data.hasOwnProperty("srs_primary_authors")) { - customItems.push(new ContextMenuItem("PrimaryAuthors: " + evt.info.data.srs_primary_authors)); + srs_primary_authors = evt.info.data.srs_primary_authors; } - contextMenu.customItems = customItems; + if (evt.info.data.hasOwnProperty("srs_id")) { + srs_id = evt.info.data.srs_id; + } + update_context_items(); } // TODO: FIXME: failed event. diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf index 1b232ce4843f2ab1d74adb8b115db3dcde287532..149e179c36370fce1b3b875cfb3a53186e1ea3b2 100755 GIT binary patch literal 5470 zcmV-k6`|@wS5po;BLDz+0fjmVcoWx|@1GfIG?FiTaW_M7f=z@kd|-nK!uEgxAHm!~ zs3U2{66kO>BiT;6twSK>AR&Y!fuzA4IofV|x9NTF_DWLOG@*C9X}g6;k>PALJYDZSqCR0Oo4Q*|0b@h#Pjg2c%V}&u6FxAl&31jK9wah@5 zW`t7FVKbUc$kd=3Os36_Wy^9_!=Y)T!|7CvnGA>Ow3rsx5~fktP}_ip!l8COnTo6C zT6K6h77eM?T;1pjBa#dq7*R9Y3O%M8ku`NQigb<{HDlUZUpN`mWF@AJ%1yFwWgA#H7UADcZ*Gapq`TidIS$&IaExv{>X$##Qs*VNJMUX$${ z2RCpnDJn_N@9SSN;2Rv=*}t`mWQ%c^XZ>}RyvDB~o!slMzrM%KqsWOvaGu{|Yi)k* z%o+u2;w86{G6K^PkuQ{AkqJQonawXDwL~OgO&^L7@(fovTe^B{`(EViO=*Uvrb3au z!!dPCL&hvMq(ZA#&tlc8h9_-ksX!)_3~M19R~hawOw5|2JA-9Yz^b8EqqtGz>+0(6 z3T*2S3~uvn=&m%z3{#5-l8JyC4hPI+fK4nxg3a9$MR7t)Eu6J*-7JdNGN#1V$fzj; zLS-o}p3G>o=DP=}KfYLWC{bv;6OI}*PS>{nfxwn-Wt&5#!XlA9&+>F86Q(w5_G*c=%QlscdO|bIl1MbHtxrc|W>2CAV>5(QGHJSFNj0pcdJ=ll zJ*=kGxMpICo&CZ6TFB(0;i8CY^p7M4QpsU0WsWV$)%;Ao`vzCmHP+X+)CH;OXu{E* zN+nYj@w8#e#;_KO>QT**&4?yP!=WGQxRt;?oUef*xtvra8#9s zG}Gof;%QS0y9TvT8gn?7t8TlF3-jCoHKE1Cfvr6|e4V=surZDdY9{X5kWm&0P%;op zVnqc)Y$3OyncJdq4SR8J&9oVf8KpCa0|Q{G@y^;=Y=Y4Ywwv}D#cNNIkV!_vqP>LS ziAO_NT#;l#Gv;)U;wC247~4!;4QWNWjmq&QHKRsjYA~ibOx$d3-hM+)Bu&}&K{iuk zatzl^)k=Z<<`tuh7*Q-wd(e|kq=RbcfD>ajlfwmh6-qb~7`ox`rBdpcyLZ~Rc`40I zMX_LHJ0>~jesyV$tR}+pHBnSUjX+nd{zo~vKOdISRd(=cSF&0mzjjG0S6k!wzY-RWo z$WKDUYWbVlUo=a-HaD}jGnO>8a6zt?S)S*zFZC{GI}l<@i|nk(HpRN$jLut_SFobB z@Ea}aj6W|oUpA9+&bTdD{N~OMrb8jkFbY_6!0M*il30cqW*?`7X1Z+!YTX%%Mez!B z_jPZhm*2MSgV+mbHxCCgcx5CpOuR*%cELOCJ9Sz^O^2g74fo6$aN4(RiM_}S-=mtQ z8jASnq@0Vk*#cY8$=VK&Pdupe;9Cu^s<1ZNuRD!&5MvQ@4cTqS)rZ=1@@F?Es;YMe zSOXOUcIzz1i#uh~^yM@tDtTo)4q4bV*xx6iJv=f|eGCP*>#~bAVD!Wj)-ur$Eyb`_ zh~0LkCzRV&FcV$?#S851p{wAPnYgAg$WWcPMSDz1u7+61bY|ssGwsaCrL*){ldtr# zO_sZ~L{tmo>1H-$ca0o1WTxTCRVzKzg|jNfl}xPP*@fL!%vF}d3~f)vZhG@$cwKfK ztgzpr5#@Dh7j@b@1o2Xqo$dt9-fd}o%a~&lV{OIbebem&_QChdtd3-j>fuhvGf$Cr zc^;Eh&!oAAo&HdVgB4~Go0K=+A$sK$n(mOQ8yoAJ>o?v}Q#eaOpi(#9f-!6oc%s~c z$#f#zNlP40z?Ln$d;15ww+h3dxGD^E_WCH6rr37J;6Qixu40`&l8gZ@HGnsWX4brU z;_@fxn)BfqZER`6p9eagcZuRLyiQ`0y?M&8QBHZAwK0V*z;3{d8uQrVo%BsmVB;Iv zlc3Nh)<^LoG_@R+%Wy#iE#)tEJ~Q019E(}rG0@_b!%2EyQgUN0Dor1XeCBJ#oQFaj zUs;}wsDp1m>ax)5>*;f?_YHP$>FMisFz20p>3C2}@%pgA4<&~MBYKAhqYiw*Molqj zyVfwX$*i5o5xQ_S4YuaZH{6wTfnI%VnT~m0`M`CFsmAqcIx1Jo%xJZpjT)Jq{SG|F z_UZ3%dS!I3!|j!G?ojj{b|H4mrQz+MJ#LUS%6!U-@!gY)dJEm7GPcHSoifz9ezQd6 z(dRjRH|4hCACw0(Y&TdgG~%)QC1ZN*UkjZP?86S`qh!SK!5+cm;i7LCD&Rs97@Hdi zgj4EBAQ;1f4A6JYP>R-cA$q~ISQC9qN8a%2a}A}`;Yc)ONI`8Vnoy##n2Rp36|YfI zON1$7#amVVn|gvC4khW2DEz4xO+@KsjNLgl%nv6GzO8X3-`3VFG}Je*6dLePXlSf& z6B<_5H{quV$(60EgodU@B%7(AxdruF8gNESOQX=xN@uL1%Bz}@*Va&vA5>|qZ)^}6 zo9kB!P4%lMs~!%s`A(9*K1!O_sr+|Y#Iww4x0LsNYd z;;WjP>KzSjtxc<(_D_>y_Q;s|u~0bccg37H{0ga@CGX7tcv+OsNCdzZmA@rom(U?epg7f_^p%b@!KFZ;&-Lggx_Ydq($UbiCmjFr(K-0M&vp~ zZmkHnilysBSTAy2V%Y|f>k+w4BJ_$}p9ljYcbmv<6-x$1Zl}oY6S;us2#KJH&LI&Z zBJ3BrpvWbp-5~NwDFxCJkTj4YAnnH$4H42JWJDMf;hkdnKZ)>eksAk*y9+tCA5hI-p!DBy{0ENLaQqU-uh5%c zBm51@uOhT?{1!)}$Tf-F_YnIXYWyDIA8`B+jz8h}GmgLD08u!{iTng73g>ZLz;ThA zLkNfeNK-(dR_GirB(=K;SKHR^AK$%)LKPvYjS*7Ip++Y+UP!+O3mvuXZEY15?}vj& z;RKw7LvRF0?Q=l*+P>C`ufX^R;Dg9Qs;c5YDOG$3ptkCdFkXyi+x`mUbQWEE>E8hU z7yb_zc-;o$9HZ{C!9g3`ZG%HLIBbJ^Y;eQ|_uAk-8{BV$2W)WE1`pccAsZaC!NWE< zZi7c`aKZ*BZE(s4r)}`44IZ<>85^9n!Q(b~!UpfL!IRu24#RxPrk>{DNjL|RL}1DM zb)>zZ0LVfc!eSe8H`tI5+fZ1tj{>@!5f(-j(#G*nG=z}np?E(+frpaK2pv4k*@Do?L#fk8I4E1;BRrIE z@(}?l4)_Q*r!}@ebJyB%-mNyA-{T`rSkUMrZdlmlBOX|^-A4*w@m3!xgty(|BSmn- zW8fpjAmhIamS6(9fN)E0oI?Oy5}&Q#fNUNl_xj)R)~am1wJf`xM8K-1fV0}NJ;Z9y z>ip@_azd=tS-+qQx+AMQ6_KkcaUriGD=SW@v2I0694|=jR{>3RXX~#*A?dyfMbLK@ zin)E3a?NBHS7U8NvwlgJbhqlUdMHt#7wCm*k+nJNFWyv4)Dmk;RxeTJkQ%EmtC#9! zdii+8E7ri2S5_+Fbg3Jczs*0_TeWE}@Yc5Mls-?LZ*51oKwW6Nl?I%jwC9J} z{NW9jLDjq%UZb)SEt-t%&+1K#%uv_#=JA%7tr35#-b&F|tWmVKZF0i9ePU|DyJLdc zy@O87>I<{_{K+Y0l~7~diOvZEI=32q8wcv#ZZZy6VGoRhbr+zK+tJ8gG{P(#1lz=7 zYC>7X*I0K0nsDSz9LkwE#7rCl>o7I(_G?YtlQVI{w233sgj3)o_aU012bql^IR@4- z@UQlUH?4*pK*M_&vicgitPGQN941kuBRzp)r315e0;Owh=}9JyB0ViVjnZ3f>7z_~ z0O@Jz8St0rC6nqp>nwFfB;a;C(U%t}<>EPyXECkNtJFV>h7_OFefoMkDZisilE8Zk z4hblK5q2(r1rs?8FM>uUJIE-W1koW_gBIX-!V0D^q$W zMmm{O(Yw5w(hZqXybi1>*taIHrYn&()^}#KBGXzg!@jlCS{ov3tt&HH`=_Ldj3SzsbK@-|QVxHep5n6gF6|&M1#E z<)7u1e@>OR=v%yZFy&vM@-JtU?<^D0@~@EjYuMN8@ALQT{hRtA(rf(&{JnbbcA^eg zR~hQ>)I0Ut*12dq!9@Q7{9CDpe^4LvZ_~FaTd^Mh2>$JixkKOK->L6Zwj=XT;NPY1 z%9P@NIkEn1n?kX&8>{B8;NPR~u|UOK!Fg5n2d9~_Qz);LF3 zz?^YP0QC-X{#&RKcJ}Y)HW2RZ1UiXIxOU=pi0*=?X<1ytvfjBoJ!_cToSgL)7NK?xy!W}0?TnjPe4AWN0iu=Om%IP7)rWf+g$?tKgsRIuL9Fo()n z&q0=L{fF|NTOXn8IZu~XVpczjIBh=2ap;<&1C7o4IMa~Jm!ZZdAe+^PyiZaVs!Vv# z!30AitUu8*dLE15v(ykaG!zMF=q8}qu|7v3QH`^+k5sNqrCgaF#x2e2;VOckd>L_v<1XtS4wcadmy*CLI)a7c z+Do9FBnj6>h6&$Bwh^I%>?Do~vV%BV$siG{$UBIuop?CBg?HnEM>)KPA4EgFnNphN zhbStu%06bJw2~jDsFK2idz{P4YOi$y8U1!EIZ06_J4I#v)}!bMDd3%w`*qsx&fp4H z;R8U~5Si3ubwaaArOBv?;z zRh34_VLiiPv3>-+9|h}KZsM|TOn5&I6G36Z`w6h#%S{9w6W-@@b^1YWDk!L?^)ZAF zHEli5p}zOiP)_gPPjXZKjGoa))X@?J=}$4?=WOApbHXtc)}Zh+O!x&`_}QHB4ipxk z@bfwPPIc7!A~#h9>N~A3(L59ig_8Sa9`o?!d>+1xAr}Mv9s-VnuLA!9f`0+wMFjr} zj+YR84V>Rb@O2Qg2)+TXNd(^nX$rx&!2L3U7r^r>XMH7~x36NVzQ&w<(RT9dG*2%9 zJFnkB;R`7ICvO(YJ%sq*rN2vm_hI^|V(2&=K8z`T5moMj!gXw_Vl`LC|?YX#*o9T3OEDepx>ZN;`PJ2g*GFRYX66B9}G!MiDTPWKA(U_X0EG zwqE9{wi_Xjb%i?nL-76xtncC$;%5FBtnb;I`4h0dkC-^&{V7;KK+HAa{Wq|Fh?q3t zeHE-9A?BR${tT=iBj%p){v52IAm*`~)vKKUKG<|0kn#H0phLMI@TC5N zn+z7H4}kT1ED=#T3Rv%dLDUtLf==Z@!1jNHp9;FGTo-S8O}r5FC=bzT_wu;AMf3^! zaSnI)etg|lU%`zf_w!fbzW^TNtq1t5ehe?%C0HOw87{MX;Xxkz$1zYIrb|7<L(d~v-${Fr+7borQlrb8H}I!mY+bxxwr73*# zMVWOzKZh=kcFtFE7uC~XUC1jj{wbUPC|H+hh)d8rAFdjPxA^VD1k zhrcqEY&{yBj~8!+UQzF#0DS`L{pUeHkKh967Z6+o{UU;Mpr6ZwU1Tx)i#$nN)?Bn! UT82MeulpYx)*tdEQ*4fZ7F)>j;v7tVl8Et6l=;&x@Y;I_7UXL2<&8d{7O|DOw7p>dE z9rWmCBoiOA;^~ya9BSco*6LcfF7GuOnRhyt%_O+XXrw_;=t(_gnGH?#P3R~Z=`_-r zq-Jf=#>Nuyh{oJCOs+R$>Bx-}+PJ>nNN8qkbHjonv$5hV(=%JLsT))2i4@mb z;4+;^M%S$LVvPci$rD;?G^>s3TY3k%^*qgE)GS=jSVn1T@+-}aO)X9sjJvskW%rzH z=Q+56TS!S+cKP7Y`r*LH$iAUnJtS9(yS(UMPuUy7X3|a1o;`cDS3r>)hvscV@? z?Aoz}Hl-tDks4BwO`8_6>NV4sHT6trJd%#;5eL^e?lLXRnyYsl%ch7|L%q&$vn0^d z)7ul;Jro+*9oXJmZBCh%o(!c^AuSpWS?LfrEJK3Z?uer}rDs+ynz&&RCFtXp%;y-_ zGA2YSGI}ySt}n9pj<9$FiTG%$*a;^ZH`zKpyN8BDJ9^dKE{zFGxZX%aOXxdsO`buF zvpcY(S2hbQUw1lX>66w@J(cx1uCj4oWPw>0i%0cs*?7Y0Pxa&4Ofi#ATi!%ki|U#F zl#%w1X&Ei4TbN?^Q1}KtV$pcCB&L}|6RF`$dQ8t)Q)}}zzfkXikqr&ajg4&$VdgrX za`k31=}c8JYg&pqrbpsNTsIXfrYrGi`J(*bHq|s%E?RZx$XF(B={1X)Jx)rTnAkG4 zIHrEhVx@jueMXB|@p0WzT)9}j$jK^4=4^c@-w`I)tOy=U*9~R}W5unXuiy|K$LLfQ z3NGX>R@C|G&sXH!C5vn)v`nh50`yZZMAy7w1hW1JY#E!?$Hvmz8? zWGIowiV8*eL|#+3cE^)C_Tv1USu36}%NGs@E`X=Tzi4N%3C72<-E=M}o_mVK@pL>Y zIa8RvWITe!6-%ddb4l+cZemJH@Xa)|h+dN4s61cR#V1Nd8HU4t|(EUeHckM(qS!fqZ`+3rN@d2DvWTYaOtKikjZFM-ktNY zEz9UuCXNN8IBQb!;n$YeDOxJ3oU@8rs1wHHqw+sK`6#_2O3;zsuuS zIN9~~zw3|d2=SEV9>G9UqxnrzSV`qQt^KRyAx?sj~3;Nk0)j+ z|Ar#-p@t${X_XU);!wOzE$F<3dlgGik6!4};QVEId&NpCdFPH`^_vGfl8r=k(=6hr z8OxC+U*-wtm{b2L-SRpL%)2|1h~u5*9qirBZmZpUM)2^m_8Se2V~vpckGG~$nzE86(EfNbbqkM>t+agEM&HIFaZ!&1`;o}PLmZ&~C zWVp?27}p}@JE+%L*C1*yDIB)EsHV{!;vG*4IlZnDZ`zE-(wEm@sO(pqbtvM%$k3pS z{;7vKs*lGbI?qBew#S7-T(xjMi%S?SSJaXpI1k^4}*bxPb+xP~uZt?U#QFRBzz zI<;+I54J}sUs*0IvL}=&+Y6GB+GerdQ+^1uFT@&!n^#r zxw)~mvG1n3;zbG~lX~&mN?^~y6XhLAXH(H`R^oU9cI?={b7-V@mpB$lYT|JB&H%%* z4BO)x8Sd@9s?=bw8gp3B3}egJt-3c)T;T+rb3S~N&226Co;UEk%M4Fo|4+!y=BZ<5 zCF5P8PpNDIer1ho37;e0$1d?A2k+x|c(Frli{s5@>3J%j;i4FND%`}v_*mPeSj@`a z;Wob#O|uJ*k$v^3G=C@xnXi}f5sFEC7Ww*62On!JWN~Mpf6%inFw(oDf3VlZgLe;R zlVLq07-Oa|njRC)_)R)Yy70*vx1_KWTGPTN^LC=d*u=GLv2}00;hua5?5^U|bS?8M zH=dW6TAZ)0t9p~doz^w!FQp$Bpnt zSx8waK2-9n-of^$g3qy7rvi1(-z*7v>^;pMI{B^m2j#&XI}MgbCVWo6IQyzh=- zA9nE=WiyE{>=+&o4|{Yl0gc39YH27G&1e&$Z~_Z5#2zA}8CKK97zNkjP4q1Tx!{@R z8O>;8v3SIk!}@4ErN$Ep51U{Y-pZ1miZaIfx2pO#jRYecO|xG;_}eU=inF^NyK`bp z7)zT%NAm`uqoY-9YHZygHsL?9skyO3Y}(M+f}a*7H*9Pdn_8NYY-NJhHq>itLW{Px zX0d4_vuJ0^?XAe`Xlld{sx&t?H;K)yjT^+4#`cY3OGihW*xKCEBDS`-wz--bH@0qc zHLzQNVh-qF$Ic78XM^7qNYOTKu~qkqW-KM|@I$-4``ELIg(AHkpC z=cfR}>}V3&Tbim|P)(~n)#cU8J#Tkiyp%436|mxx73)^iuBcmaY4yhHP1S+wzUrH3 z5m2|}k-fg6;*!!?kU*5cB_U6cBq~ebm8egmWsUJE5k-h`zV##wSg0w{MMb0tQJPz{xfcOK5KM3-}h{Gc| z9>eiCNR=l+{s5DI5Y6t!aRkQ`NPigQrx^b;IGzTn?6U};!SNK1=Wu)u#|t<<5AsW> zSN5-nzl`JCAm^CfDUjy?2XQ=v;{+`ugyLUJ ziU`z;-P6US{whN2J352Y`>$qDLrCf=O1tQEG5g+9?5gkV=%}jt5ZrPb+zm%y8V&%d z{|FGFzJFuY7hw8H_$acFs;T-Jqe`a%>T7-t)1~OLxZ43o z9B|YD_c-8Q2OM+2eGWKIAEvmJM;z)=3J<{vkYxg^mv1GVMMXeXIuKSnkgjo{aJ>V? zwOdIC2;jQNfo|AJstE2H2cChgB!*t(zOAGmq4zL~?*znrd$y7qgheA;$wq|5x=K2z z03{KGf&irkLQ#M+6`@OjCEF3Y1t@n12!)FE0U|(UZ-9tUH5wq;Y?=c^hNUe5;)P|y z0pf$@I|HN$R$LY!#jx@i1V{<2!auW>;u3p+(A94%BLE&*$Te<9wg9qs+ph$>J=bWj z%k3dCuxlBhc1NzC*qu2;I9^^!h`lKn6b;dEV`V|a`Z$6QTDzL z=&Co@cm|3|?-?k8!81@wud~&2j6Jl@?nAdh*^mvd=Ck`5QDhVu#afAdMJ`x6P)f8i zdq>VFQ$~&O$R0At z5WM@ z12suW2do+$=8{y0(^y0h7Ly`=T}js&xDCirEUCKz7&royfoTvJH~`{NuzN^%^1lsVGzKK5$#{7UM)E1FL3aF%+Dx>@)^EvN!w#T%`vw&Vt*EL!Pr2IXan{$kTV8& zc|OZ99K#!Ofd$JdIOfyZ?Jki`v`QB z8wu?o2_kfmAtF|hUBp#It|ab_WROTTBuPA-#7prq+>aCf0jtXXBRc9EFK1c)6GIhV z-hXybR?dH6sG7pl`&Y;*TAzIu83W_xOVDDPBFbeqQ7BR%W?6wHRjS^qzQeIK0-yJr2L&e!P)Iu{nTF?$xFOM8cX zlA^x##mqGd*g0Fz*1q5FO`SS?A2HqDDd>wo*Q~Q&Jygh}f`ZN#n8%~g)VR`x{@bmgK z3ZFsYl>b{$=_4d~lW~*r&Y3bPkG^YW1~dFDYP@>}Q~VqazUQ>@UiCeYjkxXSX|Ut8 zF%4n&<7x+(5y}1>4R)S3ZU(gz{I7s|3qTDq4xq?mzi^=lxJb4?&;1+(?!;@qNNe_( z5ug1f7U#c%|2trR8Fvr&@w;Gu#o5R2f&Ep)q*?#>!TuUzo>~8Yfcg~+zw`^mJ*(302iW~bo+}PUJ za8Jqaa8up@I4Ib^$3t-#ui3R&8-L)q!taGYQfwWELA`@b^(S^-4ukzSnhV|u19t+6 zA$69kpW^D%0@J=ky9=K*Lhx=pbZCohyv{y|l8a6mN8s^O#!)z#ebt^3=5of`l2$^_ zz%PLw66`~$vzCcb=LqV&X5Y&FAy+#B_HCRvtsRB3WfoqCKV>s}#=WqtII7oxdOtIGxIhzp`#k{o_a3g9ZTn*WPE#Jbf|^j2PR;s4Zc M#b2WT55~g}zShlSy8r+H diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as index 87d34bddc..e3a14392b 100755 --- a/trunk/research/players/srs_publisher/src/srs_publisher.as +++ b/trunk/research/players/srs_publisher/src/srs_publisher.as @@ -134,6 +134,25 @@ package flash.external.ExternalInterface.call(this.js_on_publisher_warn, this.js_id, code); } + // srs infos + private var srs_server:String = null; + private var srs_primary_authors:String = null; + private var srs_id:String = null; + private function update_context_items():void { + // for context menu + var customItems:Array = [new ContextMenuItem("SrsPlayer")]; + if (srs_server != null) { + customItems.push(new ContextMenuItem("Server: " + srs_server)); + } + if (srs_primary_authors != null) { + customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary_authors)); + } + if (srs_id != null) { + customItems.push(new ContextMenuItem("SrsId: " + srs_id)); + } + contextMenu.customItems = customItems; + } + /** * publish stream to server. * @param url a string indicates the rtmp url to publish. @@ -187,15 +206,16 @@ package trace ("NetConnection: code=" + evt.info.code); if (evt.info.hasOwnProperty("data") && evt.info.data) { - // for context menu - var customItems:Array = [new ContextMenuItem("SrsPlayer")]; if (evt.info.data.hasOwnProperty("srs_server")) { - customItems.push(new ContextMenuItem("Server: " + evt.info.data.srs_server)); + srs_server = evt.info.data.srs_server; } if (evt.info.data.hasOwnProperty("srs_primary_authors")) { - customItems.push(new ContextMenuItem("PrimaryAuthors: " + evt.info.data.srs_primary_authors)); + srs_primary_authors = evt.info.data.srs_primary_authors; } - contextMenu.customItems = customItems; + if (evt.info.data.hasOwnProperty("srs_id")) { + srs_id = evt.info.data.srs_id; + } + update_context_items(); } if (evt.info.code == "NetConnection.Connect.Closed") { diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 78e86518c..241fc9b13 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "117" +#define VERSION_REVISION "118" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/rtmp/srs_protocol_rtmp.cpp b/trunk/src/rtmp/srs_protocol_rtmp.cpp index 30ab1eb86..d830dbc18 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp.cpp @@ -866,6 +866,8 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) if (server_ip) { data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); } + // for edge to directly get the id of client. + data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id())); if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { srs_error("send connect app response message failed. ret=%d", ret);