胡斌

add start audio share and stop audio share,get mic about agora sdk

正在显示 1 个修改的文件 包含 75 行增加2 行删除
@@ -607,6 +607,7 @@ @@ -607,6 +607,7 @@
607 "EXT_INPUT", 607 "EXT_INPUT",
608 "AGORA_ENTER_CHANNEL", 608 "AGORA_ENTER_CHANNEL",
609 "AGORA_LEAVE_CHANNEL", 609 "AGORA_LEAVE_CHANNEL",
  610 + "AGORA_GET_MIC",
610 "AGORA_SS_START", 611 "AGORA_SS_START",
611 "AGORA_SS_STOP"]; 612 "AGORA_SS_STOP"];
612 613
@@ -833,6 +834,45 @@ @@ -833,6 +834,45 @@
833 document.getElementById("res_screen_share").innerHTML = "stop screen share failed"; 834 document.getElementById("res_screen_share").innerHTML = "stop screen share failed";
834 } 835 }
835 } 836 }
  837 + else if(124 == result) {
  838 + if (data_len > 4) {
  839 + var mic_num = dv.getUint32(8, true);
  840 + var offset = 12;
  841 + var aac_micSel = document.getElementById("aac_mics");
  842 + aac_micSel.options.length = 0;
  843 + for (var i = 0; i < mic_num; i++) {
  844 + var mic_name_len = dv.getUint32(offset, true);
  845 + offset += 4;
  846 + var mic_name = new Uint8Array(evt.target.result, offset, mic_name_len - 1);
  847 + offset += mic_name_len;
  848 + var data_sting = utf8to16(mic_name);
  849 +
  850 + writeToScreen('<span style="color: green;">Agora_MIC: ' + i + " " + data_sting + ' </span>');
  851 + var op = document.createElement("option");
  852 + op.value = i;
  853 + op.text = data_sting;
  854 + aac_micSel.add(op);
  855 + }
  856 + }
  857 + }
  858 + else if(125 == result) {
  859 + var ret = dv.getInt32(8, true);
  860 + if(0 == ret) {
  861 + document.getElementById("res_audio_share").innerHTML = "start audio share success";
  862 + }
  863 + else {
  864 + document.getElementById("res_audio_share").innerHTML = "start audio share failed";
  865 + }
  866 + }
  867 + else if(126 == result) {
  868 + var ret = dv.getInt32(8, true);
  869 + if(0 == ret) {
  870 + document.getElementById("res_audio_share").innerHTML = "stop audio share success";
  871 + }
  872 + else {
  873 + document.getElementById("res_audio_share").innerHTML = "stop audio share failed";
  874 + }
  875 + }
836 else { 876 else {
837 var data = new Uint8Array(evt.target.result, 8, evt.target.result.byteLength - 8); 877 var data = new Uint8Array(evt.target.result, 8, evt.target.result.byteLength - 8);
838 //var data_sting = new TextDecoder("utf-8").decode(data); 878 //var data_sting = new TextDecoder("utf-8").decode(data);
@@ -1197,6 +1237,11 @@ @@ -1197,6 +1237,11 @@
1197 param += "Rect="; 1237 param += "Rect=";
1198 param += asc_region; 1238 param += asc_region;
1199 } 1239 }
  1240 + var fps = document.getElementById("asc_fps").value;
  1241 + if(fps.length > 0) {
  1242 + param += " Fps=";
  1243 + param += fps;
  1244 + }
1200 cmd.data = utf16to8(param); 1245 cmd.data = utf16to8(param);
1201 cmd.data_len = cmd.data.length; 1246 cmd.data_len = cmd.data.length;
1202 } 1247 }
@@ -1204,6 +1249,23 @@ @@ -1204,6 +1249,23 @@
1204 cmd.type = 61; 1249 cmd.type = 61;
1205 cmd.data_len = 0; 1250 cmd.data_len = 0;
1206 } 1251 }
  1252 + else if(cmdName == "get_aac_mics") {
  1253 + cmd.type = 62;
  1254 + cmd.data_len = 0;
  1255 + }
  1256 + else if(cmdName == "start_audio_share"){
  1257 + cmd.type = 63;
  1258 + var micSel = document.getElementById("aac_mics");
  1259 + var index = micSel.selectedIndex;
  1260 + var sel_mic_name = micSel.options[index].text;
  1261 +
  1262 + cmd.data = utf16to8(sel_mic_name);
  1263 + cmd.data_len = cmd.data.length;
  1264 + }
  1265 + else if(cmdName == "stop_audio_share"){
  1266 + cmd.type = 64;
  1267 + cmd.data_len = 0;
  1268 + }
1207 1269
1208 doSendWSCmd(cmd); 1270 doSendWSCmd(cmd);
1209 } 1271 }
@@ -1743,7 +1805,7 @@ @@ -1743,7 +1805,7 @@
1743 1805
1744 <td colspan="2">Token</td> 1806 <td colspan="2">Token</td>
1745 <td colspan="4"> 1807 <td colspan="4">
1746 - <input id="token" size="160" /> 1808 + <input id="token" size="180" />
1747 </td> 1809 </td>
1748 1810
1749 </tr> 1811 </tr>
@@ -1769,7 +1831,7 @@ @@ -1769,7 +1831,7 @@
1769 <tr> 1831 <tr>
1770 <td>encryption secret</td> 1832 <td>encryption secret</td>
1771 <td colspan="4"> 1833 <td colspan="4">
1772 - <input id="enc_secrete" size="160"/> 1834 + <input id="enc_secrete" size="180"/>
1773 </td> 1835 </td>
1774 </tr> 1836 </tr>
1775 <tr> 1837 <tr>
@@ -1797,6 +1859,17 @@ @@ -1797,6 +1859,17 @@
1797 <td colspan="2"><button type="button" id="stop_screen_share" onclick="javascript:onTestClick(this);">Stop Screen Share</button></td> 1859 <td colspan="2"><button type="button" id="stop_screen_share" onclick="javascript:onTestClick(this);">Stop Screen Share</button></td>
1798 <td><div id="res_screen_share"></div></td> 1860 <td><div id="res_screen_share"></div></td>
1799 </tr> 1861 </tr>
  1862 + </tr>
  1863 + <td colspan="2"><button type="button" id="get_aac_mics" onclick="javascript:onTestClick(this);">Get Agora Mics</button></td>
  1864 + <td colspan="4">
  1865 + <select id="aac_mics" name="aac_mics" />
  1866 + </td>
  1867 + </tr>
  1868 + <tr>
  1869 + <td colspan="2"><button type="button" id="start_audio_share" onclick="javascript:onTestClick(this);">Start Audio share</button></td>
  1870 + <td colspan="2"><button type="button" id="stop_audio_share" onclick="javascript:onTestClick(this);">Stop Audio Share</button></td>
  1871 + <td><div id="res_audio_share"></div></td>
  1872 + </tr>
1800 1873
1801 </table> 1874 </table>
1802 1875