From 9eb76cb1ebe57736d184cb478342d0a3b1dc7e85 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 11 Apr 2014 14:40:38 +0800 Subject: [PATCH] update demo.conf --- trunk/conf/demo.conf | 17 ++++++++++++++--- .../players/srs_bwt/release/srs_bwt.swf | Bin 4676 -> 4674 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf index 880cc310a..4c29eebfa 100644 --- a/trunk/conf/demo.conf +++ b/trunk/conf/demo.conf @@ -170,7 +170,6 @@ vhost players { } } } - vhost players_pub { hls { enabled on; @@ -190,7 +189,19 @@ vhost players_chat { ffmpeg ./objs/ffmpeg/bin/ffmpeg; engine chat_hls { enabled on; - vcodec copy; + vfilter { + } + vcodec libx264; + vbitrate 300; + vfps 15; + vwidth 768; + vheight 320; + vthreads 1; + vprofile baseline; + vpreset fast; + vparams { + g 30; + } acodec libaacplus; abitrate 30; asample_rate 44100; @@ -206,6 +217,6 @@ vhost chat_hls { enabled on; hls_path ./objs/nginx/html; hls_fragment 2; - hls_window 8; + hls_window 10; } } diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf index 923a8af5d17c13f834bcff08f846247cec7eff53..6b68b051a350b678e375aa1c5788cc0c921d1933 100755 GIT binary patch literal 4674 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 literal 4676 zcmV-K61(j~S5pp^9smG%0gX8ebQ{%`b7w|+8u=%G<2XNsI0*s8mVfex5Uki%aLC8R z4p4{?BWWg5B1@`fbC?ox+z z&+hTip6;GKyJx-ky&2h-2|a6{_wIZ5-Fx5tzIihm<-~vCxYB1it`@l7@`W77-C6k& zaNN2~RPEZ{8*q;fCz4th&aPe^)Ae*$W8>bvdmHw)G^8@S8k;&hI~%>tjm^z#kz%bj zmel3ZwMlKo>h(-OucAdV@w6UKCEZk@98P8Rt5>hKq(&n%Letqyf{Bbq8kK}HtR!`< zv8ka61w|uWYAQ1<>+9uoIuVb^R9xfeS}m4}?Aa@iC~MV(ti{$f&Jt1{J+3E|_5Nro zthfUSWz^m3_RsP&YLkQ#M`smXKgUd&ayLX$!;R@oDw>U;PAZCG%yU_&h;%lbh-)z= zvp$>LlT7VRGOAfDrHNz|Sx*&G6@Jb zF4?h(_G34jREqDDt$mmiA3C*+77Fjxxwop0V5%UB%VS(z1IOe1pMhAYlC6r~lS(F) z2#uG-V$_gS^wMqN-H7W;MpDsua+m1e67X`>QAL%r3B7QwaeLQJl(sXYXo{SP#CE0= z@|c1MYYT*ttFE#p4YFp_babArZv?Za*xXQ|W3ANR+uPS08rl{b9P)4MtI@_ZT^SCg zk|8-74e6;6V|3w!@otXea#G2ZS)v;)C@3SkX~>A2(d@%xTa;wBbdYX37?BgomQ++J zG53weHL9#*D{k52-`po@c>*V+_b1}Jl8&Km1EI}*fgzhrr(!0R(w&Kv991&?Nj2q6 z%NcoC(a~bN=@>p9Ese?Aw!O)LOe(Ep^s(huw$5g%f3T&o+3WQ+hO_a69#7i(GMQAS zdN`};ZY`}u;%Z#c+HXRu!n;HJHxCb)~)#*=yQms)OOx z5_Og_?jwpxxTtWwK*(Zq%?wl*^FLje^$6CIZMPPRM=LN;VL2Jy8;|O-5Y|w1tO6Gh zYbJz+!g)3w#d-)~weG^C(J0kClxvm>gRW;a*DQ^RD57R5qdE<)!&ELCcg5mSWdrqS zf3hEQM=Oe;LsP?STsDV;B5DS=54tB`e|GZ4A68utjip)xP zYKlG-A6D>CEV4Gz;|Z-|Ha$@{X6~wdCSpuR(88`+lDQcyj-=wz^1e}Ye^O4cFsO1w zDYaZ|;U#%Qjwj@BLb2%>CZ%?_=1!(`H`~eM)-z-71n!Y(C=Z1&2$4Or&R>8EVIn8y z9>j;`$R2wL%PEyE&XdxKNSQACawGC~3iudsqKB+g!yZY*v3^VOD8Z`1V6pUY zZtWYQg*>!l(2+`-3&dh78_Z~Z2|2APQR>-@1Lr;Xc+eyTu?%Hn{Q@&D2Czu6mRPnh zyp#28AKOs>mcH$!sU$u$&nS$yq&?%4n_u zbM7~%UGCb8Z#{kC;K>V5JutcN*yNMnnf&$-F1~Vd>eO9DrZ=cBmD-u*3;Pd!_Qp|@ z2Z`8eVQw3Wr=^)u%{-|WzWLDPzGs#%E_eVmV2#kIHUu#Dl<3k+FK$=pvq6b2x%Bd2 zHWIOK_ia~SGB zJa)i5BBo9qnDKc3z|^V3^|Kp)LE?$q#_jFM3$q02>KszHd2#XaG)CZOWQ zG}9>k5N716xf)rA){6%&y!7Z??Yi6oPA{VZ5Ek0AZ^oWa$M0ToY2^m34Vgcd&i7X; zomQeV_I;r~=4yM{d|u1f<`s;Imu7BWGqrjNrh&N}w8%nQ{B{N64!TZJ z@c0jZ_xLMaZqfbObBD^+I6l^T*fU`OpEQcTG;dX*{egIrUd5v}R`L!k^BZXG!&+E5 zQ#W}(6x6(ZYj!xSWJLP>UzC?!NXgE~Ifu-K8+%hpWkD#kD@AXTc#*};>6JGWQxa(* zozetfvsdu7Hw*2}Z9+#=nd#l*g(b6F{cX~U;mbPZE*xKCEDz^GMI>fe)PT%4}53u8BrkF%ubBDLO zkb*8^Qi?vGuX$1763a7OW`!jB+FQJ0dvj;orB1lHDJHhJdfUWyUuWkfYP*22qX~`Z zX!Et#6mFc4o7mCO-XV6jbvB8e9qm4R%9~!cHF>?Q9d`3(S~l;lSW^(7`>JeEBh=VyifXDHZrh3l_FAZey8616b*t)D*Ii!I zRMT0rzUF$q7z8_UNY0|-lG3s?;d#P~M6eNo5J4iMlL*BGN{CQOY?VZ)CPEFdEg(WI z5f&1mjtGm0u$Tx-h4z#8ca?5~tO*sqluux}(TFAo8je;}=($_({ z6NqpZF5iu9AGU+o4k7MaAUzHsJ%Q~>Y=^NO!S)okqu8DXr1>7w{t)3`Vf!0wA7cAk zY(K@8!*&+id2B#zzW^fsBf?)|`vluRLACkPTE@XD`&HvEZq>CoTKARles0yRIPzx3 zU9hTSFYPPuVExxve;-idZvxU(?q}nN+4vDQevFNu#WBC?w%fi7M{Rla*?dayhPAAwGvME`_fMW>*(skY3 zZ6JVivk8kFevXIYm3~fuk}Le22&EoBXM?h4KW7J5m!Bh09`SPysEGPG2`Uvo=Y*<3 zKUW0Rs-G){njt?|0ts&QL~RF?AwL4_c%@~R+<8<9c)$=Uk3!)VTVjh0+LXSC*2+hY|~9A~uUf_Bxe zlAP)YNc zZ20M(8q0;Brsfs!hxJz-6f4_S{){ zg)tPYcxxj;R?#@K->3)I|OQR7?C+?~PI>T31!$13V@^I&j|#~)aOthbs>QN|S7 zXoM-5XG2cCB5);&iLhy3PW7;-(VNP8TSc}Ul?jj1j*t)5ei?taexuCB;y2%Hz zc4Kc&Z4Y*+9cpJz?P46GhzVSU;>U1r8;=$a;@-ETg@1;!Mk??_m~jV=0#_r=*K%&$ z{!U~WsVK*VaiHAmapf++rFP@b5z#in0&))>2Cl)i`v67TX}mw@QTF|i^SZ~o&(WaY z55_(St~ssx)eX#l2LQ*OFot#HijfM!acr$;q~fa_Hw7(tSQ-ZbgB97d9Bu%VVmwGW z)E-YX&mY3bonH>P=CplK<%Dj zYHT>~Ng7YW**g4;xRP^S&2gTT@su?O*IJyXjc2Sm@4|BQeAPH%%>`Ep$E~iQtfC9Q zD6SM8!lDz?)8b9j)4Qjq@0gxGGChrR<2mYiLKEsrbo}$^cu5gaPX7dR!5fe}Q_mldZ8lC($r7M4@#c*j!XT}zGk5DsJ`qVYZsuFpnn#s^T(Wg~XuLkNrY zTxlu#|0fW()jN)d#S?VlBM5E}+v}aj1KXkA$xuH9TEl}@;r|S+p;_HO;kgGU!uAQz zyv% zfsMwe5bWO6&5d_|Y)nFZR6FOYq-psXoc26u7RLoR`(y3=*)!FjVcPr-&eTUIv~$M4 zGG!hD_vye|VU6)`1={>O)uxn&?I6`=%Cc{Y*=I2OKF9v+!tb%aQ~U$=7`8uxVOS=A zZkhahge+`-zyS-}AFZ(c$86aCvmk8$^~JFLH{=30;A!(eRIM@^mMy5&|I)BbQ!~^X zD`@z~d77$^TK>J8&#j8>Fz(^81U6$W+)D>DwQwKOn#bEWcogaqizMeHwe^19tfc$- zDUe|w_KyR{V=FI`6BC|qTe z+=j*;X2w1T++kE3uXcxd;|Om)xEA4q>vVne_?Z(dKc3?8DEB-M6K5u9Z>~&uUcgQ0 zv+*buTOr~B(12nmm{`0bPVmMtOWqPHkBK@?MKP`ul&caiz|JD%I*DAyvlLau12{T! zUPM+aT(DBD^ac}Z!W$e`hrPk1n)C)!YRVhjqwZndP23Xp7u$^-l_=n?s-t*z((CD< z_5HIE2YqusjB@lB8~m%Q%~N#Er?}?-^Ycrd`>J`|_;ZZdi(eC^u(B(jq@&C8r1LkL zuNuMc50pWq9}nDL%B7grSg-6~PG@~^W#7jC;E=4%zIa>*omSHQ$R=EI5YY{HQyQ?JPWtGRPIsV(}EgA^DMbr3;;OIqGL9}rI zf+*y?m>amiXsi8PFdUd}61~|vt=kuG6yZA0^P+7zu9wh*fN-ToDZ8AF!^cMXX;sM4 zJMyt>@y)IwN<2`m_R*$qmnanjcC4