From 15f651bccd47c386f3ceb902a4a5b665d9ba883b Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 11 Apr 2014 14:13:14 +0800
Subject: [PATCH] update demo, support acodec

---
 trunk/conf/demo.conf                          |  25 +++++++++++-
 trunk/research/players/js/srs.page.js         |  38 +++++++++++++-----
 .../players/srs_bwt/release/srs_bwt.swf       | Bin 4674 -> 4676 bytes
 trunk/research/players/srs_chat.html          |  17 +++++++-
 .../players/srs_player/release/srs_player.swf | Bin 5360 -> 5360 bytes
 trunk/research/players/srs_publisher.html     |  17 +++++++-
 .../srs_publisher/release/srs_publisher.swf   | Bin 5205 -> 5306 bytes
 .../srs_publisher/src/srs_publisher.as        |  12 +++++-
 trunk/src/app/srs_app_codec.cpp               |   4 +-
 trunk/src/app/srs_app_rtmp_conn.cpp           |   2 +-
 trunk/src/app/srs_app_source.cpp              |   2 +-
 11 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf
index 0ef397807..3383140b0 100644
--- a/trunk/conf/demo.conf
+++ b/trunk/conf/demo.conf
@@ -180,9 +180,32 @@ vhost players_pub {
     }
 }
 
-vhost players_pub_rtmp {
+vhost players_chat {
     gop_cache       off;
     hls {
         enabled         off;
     }
+    transcode {
+        enabled         on;
+        ffmpeg          ./objs/ffmpeg/bin/ffmpeg;
+        engine chat_hls {
+            enabled         on;
+            vcodec          copy;
+            acodec          libaacplus;
+            abitrate        30;
+            asample_rate    44100;
+            achannels       2;
+            aparams {
+            }
+            output          rtmp://127.0.0.1:[port]/[app]?vhost=players_pub/[stream];
+        }
+    }
+}
+vhost chat_hls {
+    hls {
+        enabled         on;
+        hls_path        ./objs/nginx/html;
+        hls_fragment    2;
+        hls_window      8;
+    }
 }
diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 2a7a58f31..042b6a119 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -2,6 +2,9 @@
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
+// to query the swf anti cache.
+function srs_get_version_code() { return "1.20"; }
+
 /**
 * player specified size.
 */
@@ -9,8 +12,6 @@ function srs_get_player_modal() { return 740; }
 function srs_get_player_width() { return srs_get_player_modal() - 30; }
 function srs_get_player_height() { return srs_get_player_width() * 9 / 19; }
 
-// to query the swf anti cache.
-function srs_get_version_code() { return "1.19"; }
 // get the default vhost for players.
 function srs_get_player_vhost() { return "players"; }
 // the api server port, for chat room.
@@ -23,7 +24,7 @@ function srs_get_srs_http_server_port() { return 8080; }
 // if not equals to the player vhost, return the orignal vhost.
 function srs_get_player_publish_vhost(src_vhost) { return (src_vhost != srs_get_player_vhost())? src_vhost:(src_vhost + "_pub"); }
 // for chat, use rtmp only vhost, low latecy, without gop cache.
-function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_player_vhost())? src_vhost:(src_vhost + "_pub_rtmp"); }
+function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_player_vhost())? src_vhost:(src_vhost + "_chat"); }
 
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
@@ -181,7 +182,8 @@ function srs_can_republish() {
 // without default values set.
 function srs_initialize_codec_page(
     cameras, microphones,
-    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+    sl_acodec
 ) {
     $(sl_cameras).empty();
     for (var i = 0; i < cameras.length; i++) {
@@ -292,17 +294,25 @@ function srs_initialize_codec_page(
     for (i = 0; i < bitrates.length; i++) {
         $(sl_bitrate).append("<option value='" + bitrates[i] + "'>" + bitrates[i] + " kbps</option");
     }
+    
+    $(sl_acodec).empty();
+    var bitrates = ["speex", "nellymoser", "pcma", "pcmu"];
+    for (i = 0; i < bitrates.length; i++) {
+        $(sl_acodec).append("<option value='" + bitrates[i] + "'>" + bitrates[i] + "</option");
+    }
 }
 /**
 * when publisher ready, init the page elements.
 */
 function srs_publisher_initialize_page(
     cameras, microphones,
-    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+    sl_acodec
 ) {
     srs_initialize_codec_page(
         cameras, microphones,
-        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+        sl_acodec
     );
     
     //var profiles = ["baseline", "main"];
@@ -327,17 +337,22 @@ function srs_publisher_initialize_page(
     //var bitrates = ["50", "200", "350", "500", "650", "800", 
     //    "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
     $(sl_bitrate + " option[value='500']").attr("selected", true);
+    
+    // speex
+    $(sl_acodec + " option[value='speex']").attr("selected", true);
 }
 /**
 * for chat, use low latecy settings.
 */
 function srs_chat_initialize_page(
     cameras, microphones,
-    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+    sl_acodec
 ) {
     srs_initialize_codec_page(
         cameras, microphones,
-        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+        sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+        sl_acodec
     );
     
     //var profiles = ["baseline", "main"];
@@ -362,14 +377,19 @@ function srs_chat_initialize_page(
     //var bitrates = ["50", "200", "350", "500", "650", "800", 
     //    "950", "1000", "1200", "1500", "1800", "2000", "3000", "5000"];
     $(sl_bitrate + " option[value='350']").attr("selected", true);
+    
+    // speex
+    $(sl_acodec + " option[value='speex']").attr("selected", true);
 }
 /**
 * get the vcodec and acodec.
 */
 function srs_publiser_get_codec(
     vcodec, acodec,
-    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate
+    sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate,
+    sl_acodec
 ) {
+    acodec.codec       = $(sl_acodec).val();
     acodec.device_code = $(sl_microphones).val();
     acodec.device_name = $(sl_microphones).text();
     
diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf
index a76afa2c7146557a2a6f4bb0924840c578d054a8..923a8af5d17c13f834bcff08f846247cec7eff53 100755
GIT binary patch
literal 4676
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
GgF(>anjcC4

literal 4674
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
Eo42tXT>t<8

diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index d06987bf0..70eee5bd6 100644
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -82,7 +82,8 @@
                     cameras, microphones,
                     "#sl_cameras", "#sl_microphones", 
                     "#sl_vcodec", "#sl_profile", "#sl_level", "#sl_gop", "#sl_size",
-                    "#sl_fps", "#sl_bitrate"
+                    "#sl_fps", "#sl_bitrate",
+                    "#sl_acodec"
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
@@ -490,7 +491,8 @@
                 vcodec, acodec,
                 "#sl_cameras", "#sl_microphones", 
                 "#sl_vcodec", "#sl_profile", "#sl_level", "#sl_gop", "#sl_size",
-                "#sl_fps", "#sl_bitrate"
+                "#sl_fps", "#sl_bitrate",
+                "#sl_acodec"
             );
             
             var chat = {};
@@ -760,6 +762,17 @@
                         <select class="span4" id="sl_microphones"></select>
                     </div>
                 </div>
+                <div class="control-group">
+                    <label class="control-label" for="sl_acodec">
+                        编码
+                        <a id="sl_acodec_tips" href="#" data-toggle="tooltip" data-placement="right" title="">
+                            <img src="img/tooltip.png"/>
+                        </a>
+                    </label>
+                    <div class="controls">
+                        <select class="span2" id="sl_acodec"></select>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf
index 7361e298ba6c11ad14bb71d01788c6764a418eac..159bcf3546dfe09c58cd500cac253cf58d0458ce 100755
GIT binary patch
delta 4359
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
BlvMx#

delta 4359
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
Bh-m--

diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 2e2f0323f..1bf431b23 100644
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -67,7 +67,8 @@
                     cameras, microphones,
                     "#sl_cameras", "#sl_microphones", 
                     "#sl_vcodec", "#sl_profile", "#sl_level", "#sl_gop", "#sl_size",
-                    "#sl_fps", "#sl_bitrate"
+                    "#sl_fps", "#sl_bitrate",
+                    "#sl_acodec"
                 );
             };
             srs_publisher.on_publisher_error = function(code, desc) {
@@ -184,7 +185,8 @@
                 vcodec, acodec,
                 "#sl_cameras", "#sl_microphones", 
                 "#sl_vcodec", "#sl_profile", "#sl_level", "#sl_gop", "#sl_size",
-                "#sl_fps", "#sl_bitrate"
+                "#sl_fps", "#sl_bitrate",
+                "#sl_acodec"
             );
             
             info("开始推流到服务器");
@@ -376,6 +378,17 @@
                         <select class="span4" id="sl_microphones"></select>
                     </div>
                 </div>
+                <div class="control-group">
+                    <label class="control-label" for="sl_acodec">
+                        编码
+                        <a id="sl_acodec_tips" href="#" data-toggle="tooltip" data-placement="right" title="">
+                            <img src="img/tooltip.png"/>
+                        </a>
+                    </label>
+                    <div class="controls">
+                        <select class="span2" id="sl_acodec"></select>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf
index b63ee1ff784d05b875ec75355baf22a4828efccf..1b232ce4843f2ab1d74adb8b115db3dcde287532 100755
GIT binary patch
literal 5306
zcmV;r6h-SpS5poPA^-q*0fjjUbR5N%^{acPr)P9om+!b81eRc|%aSa~mho6pTN1V;
zEFTychMt*j&A=SWbdL^l32YgHIczZIFo%K@l8}pR!iFOxVRMHp8OsZ7j@=||4tA4`
zJICfuyuYevB+G`x?^XZ%*RNl{e$~j6M0}l)k|zjR2Bc@naze;^D_#OZHfN$n=dK=A
znM@{9W+zfz>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$5h<Lf;aIro+0TCiF?AMF}j}
zb8Sb3DMuFq-Ez({HD+BONhce|GU;eGf-xEBiW{G6!d#4H!-=>V(=%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>)hv<I))sB{W
zJUrBkHSx07%$TA16_GDges~QbC?JdZWu%@+B&r*uF+v`r#fznzc6DBhoNF_>scV@?
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`nh<d_Bf=O~j*C%*_jU!X4A&qcO{&V(xC-pN!^nqEG74
zxF(P4mcw-=vz8w9jOdXp=5Q)s-A)}B7r4V(N>50`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#<h4t3nz4!g`2G}yTMdaX-jcp
zP^`?9lE8U0^>V1Nd8HU4t|(EUeHckM(qS!fqZ`+3rN@d2DvWTYaOtKikjZFM-ktNY
zEz9UuCXNN8IBQb!;n$YeDOxJ3oU@8rs1w<Ywf`t5h2)8>HHqw+sK`6#_2O3;zsuuS
zIN9~~zw3|d2=SEV9>G9UqxnrzSV`qQt^K<Wm}1$WZlSrZB|DwT#W*&G63*4EtjSM`
zPfMj!Q^|DJtZA-95uV5tHVeFK3r11R(n`<iN37k*BN=m;H*kJAV0#|dGgz$*bSmOl
z){Ir~_%iXNmYE7^Su2*#m}SEb9dO7_#TUWOl1}mtwrbJr_4z>RyAx?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~<bcGV$7TI~D47
zF2Q*XEgOyJHM|Q&>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{;<a5#uN&i&=n8wm>7vKs*lGbI?qBew#S7-T<KK7!tz2WUg2yHn+5N<)Hx?vf!cyE
z))dO}HN=<9EUVA6bTXrqFVf>(xjMi%S?SSJaXpI1k^4}*bxPb+xP~uZt?U#QFRBzz
zI<;+I54J}sUs*0IvL}<c_{|UVdD(UG!hVa+QP5>=&+Y6GB+GerdQ+^1uFT@&!<v#g
zYZo@wi?11W9<M=#*O8(#J=_Up;qB0=EaS4;g*4akW)kUg@xm<OMg`|xl3&T7>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^<ps8jga@4{p3oc=DiU%}wIynZDg4nyDJ6k^v>w!FQp$Bpnt
zSx8waK2-9n-of^$g3qy7rvi1(-z*7v>^;pMI{B^m2j#&XI}MgbCVWo6<V>IQyzh=-
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
zHL<B&O&glq5#QL>zQNVh-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~ebm8egmWs<l=q7@RYl*B5DR!elL<XR@t6%t)3
z(Nz*%Ez!40bdBU*E76N&1^rwm`|-P8uE%eK+=$;Mxf#D3<QDw4N@Z;lZI@_=w4_s7
zvRR^C65S%f<x=@p3ARbJN2=H^(SC^zNU&3)gAxo&^h$~DlFCLTx=*6lNi-zUh`b*p
zAu5l8<ci5_LB0VbcS25rMAH(yLxPM1SqUbk$|(unDbaUH^xYD?NAkQ^@=RkKH-qH4
z1;+uz52Dcw!b1peMc!@b>UJE5k-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?<kL9*4QcnQuoC3gnC6dA`Z|vP!trAqKf&=+jOM=){twE3
zj_?;a{uf8HL|Y{K3Swta!$$Zk9KXTwTO9v~<99ef67Q#y@Bo#>2XQ=v;{+`ugyLUJ
ziU`z;-P6US{whN2J352Y`>$qDLrCf=O1tQEG5g+9?5gkV=%}jt5ZrPb+zm%y8V&%d
z{|FGFzJFuY7hw8H_$acFs;T-Jqe`a%>T7-t)1~OL<M%Mltk}G3{s8bt_!DsOX9xVn
z0e^MC-yCq(0n?Og-t2%|9B{w^2OTiufI|+r)d9CT;C&9b-2sOkaEAl#biiE>xZ43o
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;dE<qWqf(Yi7Z^15=0>V`V|a`Z$6QTDzL
z=&Co@cm|3|?-?k8!81@wud~&2j6Jl@?nAdh*^mvd=Ck`5QDhVu#afAdMJ`x6P)f8i
zdq>VFQ<soBdoX8|8x=<7bk(c&@SI;!tKoRL7pK26xYS=WuoMJ)cW%yDrY*PkAY7rX
zwD%%hrLDI2A$*&*#=aV%qOG;BLHKs<BKx{vjZvdsOr~pIvqPtiOUm(B+1Cfx8S8?z
zMy*k&UW%)V<W8%XA=HEZoUy)!sD6yxz@-W<LG~VFOHHt)_LA{4pu&Wm3^o`IM&t4F
z73eJ$Z1P{BHlcmmv5#{5vF*0W)cm--W_1I4v^Y7GGg>$~&O$R<r`uk!CxRP|jSPL&
zo<wiEPtE%G%+AgF_s(*^H!;JUu`*{YKQ*Vei*@!pF*s4g;5K1w)4+n;Pp07vT#bj`
zz8TQTHR$A8bizH{0*;H-%!S%6)Y%6BUAPJ^4(44P<Sq_^J;PjFf3Ax|c^7NuUEIoC
zxCwZ@Zj9ntMo9wo`Bt-{_#VsJ_nDXQDPxnd*@@!^Ovxh(zM^|Yls^aiE`1ea*Wo$P
zi89@m6m)Vbi9r;T=fHlRnHxGuz=DStP?6F8QLK*fOUGG#)a6ySjF%t44fz791TXi;
z2QG)bz<k<Y%o`b7{5PmuVZ3}bs=dgV0xI5EFgF6TXrpe!t^Cr0MRMNa%LR+nyhZoC
z#aAI%W|T3PT95sWg863uSS21x`<oDKQCqOaUxHw7P&HJ)srF(`d<(YQFE1!tT>0At
z<s4JqZfy6DbLCU0{K|szM1_c+Uq$A3;JUtGe{jGU80d#spZ#43_8EP9h<1hjJ&p#u
zj4orxR*4;G%=?cZxRYrF2aUntkTIn0#EN(wg2SA7rEz6&m$6G7M&^$pIAV;9m*am0
z*gtVxp;+CGDf$@%_ZWK|(Ho8k-Kl#~^m7a{xX;+fhW~w_UIprYm`PIm7hDgMMAfTN
z@0Sp~j5*<_?+n(4a1DVjaxI~qBuIodBD*AS(G#pxj$(!GyENj)YPkzsN3mp->5WM@
z12suW2do+$=8{y0(^y0h7Ly`=T}js&xDCirEUCKz7&royfoTvJH~`{Nu<v1o#(XAV
z)_)Jo2Cp-&Lqb$TNZ&V4yBN*S(=o^~W$k+VK8{grImbCBVAHvuW1<H30~~W{)P4wZ
zeE%OQL~cLE=5rq}ug28QBF=gMa$JU{hJmfkew=G4mFrOBB;;~N#QzXup~|fP1k7?Y
z%G(61r4L{we1ti|zJekV9bF78JNA>zN^%^1lsVG<k1`gj6dZ}hf}@Y2qo=qDJ7C!V
z>zKK5$#{7UM)E1<!0@w>FL3aF%+Dx>@)^EvN!w#T%`vw&Vt*EL!Pr2IXan{$kTV8&
zc|OZ9<BF|rEzbJ^Qu$i-<ZJa;I8V;FzJ}nZP)l?s>9K#!Ofd$JdIOfyZ?Jki`v`QB
z8wu?o2_kfmAtF|hUBp#It|ab_WROTTBuPA-#7prq+>aCf0jtXXBRc9EFK1c)6GIhV
z-hXybR?dH6sG7pl`&Y;*TAzIu83W_xOVDDPBFbeqQ<M$Z2Pn2UpWv3gXITrJp{zMS
z31kMJfFA{5-~dntJ_f=O1Ruu|r1l{?cf6dP=UeG^`!JnTDj9JH5=Ur_$Bc;fQCd@N
zMqKv26pQr};Qu7p$LQ>7BR%W?6wHRjS^qzQeIK0-yJr2L&e!P)Iu{nTF?$xFOM8cX
zlA^x<pP`angCC%C!HkhHOwB4&k^UeTKI;gd$P2S5tV7|4xbS&L_~E<||Hxlfgu*BD
z^n_;FAER?MpiSBzXL%?Ri)C+4z&w1SkcUs;l1qVor-3r?MG&4r@FIxMBKQ|@J%`{+
z;C>##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>~8Yfc<sE<XQiJg8dD|
z+_U~4fc;IxytDovg8dR=KBrH;OoKBpFau<I1|mgvj)sfEV%Vh~0z9Or=&5j#b}QIF
z#OjdL+W<@br-*vOa@eiD53v3J21##?=j6q2NRNko>g~+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_HCRvtsRB3Wf<n|oSb8l!+EufP-fp*uwj#<
zpZC|$liEFC-&IiJ{G$&4Ua*e{xWu&>oqCKV>s}#<Hw2pEtMWd^I3{5BO4z${J0|Zz
ze4MkJi99H<n+YBi>=WqtII7oxdOtIGxIhzp`#k{o_<MwN)CU0@(n;p7l;S&I%{8LK
z<#_Q{8C8wJhrxIl8iS93@d$!P!FUwGV_-an-~<>a3g9ZTn*WPE#Jbf|^j2PR;s4Zc
M#b2WT55~g}zShlSy8r+H

literal 5205
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
Pe}r$tUx|MO5w6)yw;Up<

diff --git a/trunk/research/players/srs_publisher/src/srs_publisher.as b/trunk/research/players/srs_publisher/src/srs_publisher.as
index d91641493..87d34bddc 100755
--- a/trunk/research/players/srs_publisher/src/srs_publisher.as
+++ b/trunk/research/players/srs_publisher/src/srs_publisher.as
@@ -273,7 +273,7 @@ package
             var microRate:int = 22; // 22 === 22050 Hz
             
             trace("[Publish] audio encoding parameters: " 
-                + "audio(microphone) encodeQuality=" + microEncodeQuality
+                + "audio(microphone) codec=" + acodec.codec + "encodeQuality=" + microEncodeQuality
                 + ", rate=" + microRate + "(22050Hz)"
             );
             
@@ -288,7 +288,15 @@ package
             m.rate = microRate;
             
             // see: http://www.adobe.com/cn/devnet/flashplayer/articles/acoustic-echo-cancellation.html
-            m.codec = SoundCodec.SPEEX;
+            if (acodec.codec == "nellymoser") {
+                m.codec = SoundCodec.NELLYMOSER;
+            } else if (acodec.codec == "pcma") {
+                m.codec = SoundCodec.PCMA;
+            } else if (acodec.codec == "pcmu") {
+                m.codec = SoundCodec.PCMU;
+            } else {
+                m.codec = SoundCodec.SPEEX;
+            }
             m.framesPerPacket = 1;
         }
         private function __build_video_codec(stream:NetStream, c:Camera, vcodec:Object):void {
diff --git a/trunk/src/app/srs_app_codec.cpp b/trunk/src/app/srs_app_codec.cpp
index 1170506c7..2a68625ae 100644
--- a/trunk/src/app/srs_app_codec.cpp
+++ b/trunk/src/app/srs_app_codec.cpp
@@ -189,7 +189,7 @@ int SrsCodec::audio_aac_demux(int8_t* data, int size, SrsCodecSample* sample)
     // only support aac
     if (audio_codec_id != SrsCodecAudioAAC) {
         ret = ERROR_HLS_DECODE_ERROR;
-        srs_error("hls only support audio aac codec. ret=%d", ret);
+        srs_error("hls only support audio aac codec. actual=%d, ret=%d", audio_codec_id, ret);
         return ret;
     }
 
@@ -299,7 +299,7 @@ int SrsCodec::video_avc_demux(int8_t* data, int size, SrsCodecSample* sample)
     // only support h.264/avc
     if (codec_id != SrsCodecVideoAVC) {
         ret = ERROR_HLS_DECODE_ERROR;
-        srs_error("hls only support video h.264/avc codec. ret=%d", ret);
+        srs_error("hls only support video h.264/avc codec. actual=%d, ret=%d", codec_id, ret);
         return ret;
     }
     video_codec_id = codec_id;
diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
index 4608aef38..532d86003 100644
--- a/trunk/src/app/srs_app_rtmp_conn.cpp
+++ b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -289,7 +289,7 @@ int SrsRtmpConn::stream_service_cycle()
     }
     
     bool enabled_cache = _srs_config->get_gop_cache(req->vhost);
-    srs_info("source found, url=%s, enabled_cache=%d", req->get_stream_url().c_str(), enabled_cache);
+    srs_trace("source found, url=%s, enabled_cache=%d", req->get_stream_url().c_str(), enabled_cache);
     source->set_cache(enabled_cache);
     
     switch (type) {
diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index 25db3734a..41b96fbeb 100644
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -418,7 +418,7 @@ SrsSource* SrsSource::find(SrsRequest* req)
     
     if (pool.find(stream_url) == pool.end()) {
         pool[stream_url] = new SrsSource(req);
-        srs_verbose("create new source for url=%s, vhost=%s", stream_url.c_str(), vhost.c_str());
+        srs_info("create new source for url=%s, vhost=%s", stream_url.c_str(), vhost.c_str());
     }
     
     return pool[stream_url];