Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
liveAssistant_web_demo
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
胡斌
2018-10-27 22:27:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
417be32d39101653d7178dc1d32c6d723e1334fb
417be32d
1 parent
29643542
add start audio share and stop audio share,get mic about agora sdk
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
75 行增加
和
2 行删除
demo.html
demo.html
查看文件 @
417be32
...
...
@@ -607,6 +607,7 @@
"EXT_INPUT"
,
"AGORA_ENTER_CHANNEL"
,
"AGORA_LEAVE_CHANNEL"
,
"AGORA_GET_MIC"
,
"AGORA_SS_START"
,
"AGORA_SS_STOP"
];
...
...
@@ -833,6 +834,45 @@
document
.
getElementById
(
"res_screen_share"
).
innerHTML
=
"stop screen share failed"
;
}
}
else
if
(
124
==
result
)
{
if
(
data_len
>
4
)
{
var
mic_num
=
dv
.
getUint32
(
8
,
true
);
var
offset
=
12
;
var
aac_micSel
=
document
.
getElementById
(
"aac_mics"
);
aac_micSel
.
options
.
length
=
0
;
for
(
var
i
=
0
;
i
<
mic_num
;
i
++
)
{
var
mic_name_len
=
dv
.
getUint32
(
offset
,
true
);
offset
+=
4
;
var
mic_name
=
new
Uint8Array
(
evt
.
target
.
result
,
offset
,
mic_name_len
-
1
);
offset
+=
mic_name_len
;
var
data_sting
=
utf8to16
(
mic_name
);
writeToScreen
(
'<span style="color: green;">Agora_MIC: '
+
i
+
" "
+
data_sting
+
' </span>'
);
var
op
=
document
.
createElement
(
"option"
);
op
.
value
=
i
;
op
.
text
=
data_sting
;
aac_micSel
.
add
(
op
);
}
}
}
else
if
(
125
==
result
)
{
var
ret
=
dv
.
getInt32
(
8
,
true
);
if
(
0
==
ret
)
{
document
.
getElementById
(
"res_audio_share"
).
innerHTML
=
"start audio share success"
;
}
else
{
document
.
getElementById
(
"res_audio_share"
).
innerHTML
=
"start audio share failed"
;
}
}
else
if
(
126
==
result
)
{
var
ret
=
dv
.
getInt32
(
8
,
true
);
if
(
0
==
ret
)
{
document
.
getElementById
(
"res_audio_share"
).
innerHTML
=
"stop audio share success"
;
}
else
{
document
.
getElementById
(
"res_audio_share"
).
innerHTML
=
"stop audio share failed"
;
}
}
else
{
var
data
=
new
Uint8Array
(
evt
.
target
.
result
,
8
,
evt
.
target
.
result
.
byteLength
-
8
);
//var data_sting = new TextDecoder("utf-8").decode(data);
...
...
@@ -1197,6 +1237,11 @@
param
+=
"Rect="
;
param
+=
asc_region
;
}
var
fps
=
document
.
getElementById
(
"asc_fps"
).
value
;
if
(
fps
.
length
>
0
)
{
param
+=
" Fps="
;
param
+=
fps
;
}
cmd
.
data
=
utf16to8
(
param
);
cmd
.
data_len
=
cmd
.
data
.
length
;
}
...
...
@@ -1204,6 +1249,23 @@
cmd
.
type
=
61
;
cmd
.
data_len
=
0
;
}
else
if
(
cmdName
==
"get_aac_mics"
)
{
cmd
.
type
=
62
;
cmd
.
data_len
=
0
;
}
else
if
(
cmdName
==
"start_audio_share"
){
cmd
.
type
=
63
;
var
micSel
=
document
.
getElementById
(
"aac_mics"
);
var
index
=
micSel
.
selectedIndex
;
var
sel_mic_name
=
micSel
.
options
[
index
].
text
;
cmd
.
data
=
utf16to8
(
sel_mic_name
);
cmd
.
data_len
=
cmd
.
data
.
length
;
}
else
if
(
cmdName
==
"stop_audio_share"
){
cmd
.
type
=
64
;
cmd
.
data_len
=
0
;
}
doSendWSCmd
(
cmd
);
}
...
...
@@ -1743,7 +1805,7 @@
<td
colspan=
"2"
>
Token
</td>
<td
colspan=
"4"
>
<input
id=
"token"
size=
"1
6
0"
/>
<input
id=
"token"
size=
"1
8
0"
/>
</td>
</tr>
...
...
@@ -1769,7 +1831,7 @@
<tr>
<td>
encryption secret
</td>
<td
colspan=
"4"
>
<input
id=
"enc_secrete"
size=
"1
6
0"
/>
<input
id=
"enc_secrete"
size=
"1
8
0"
/>
</td>
</tr>
<tr>
...
...
@@ -1797,6 +1859,17 @@
<td
colspan=
"2"
><button
type=
"button"
id=
"stop_screen_share"
onclick=
"javascript:onTestClick(this);"
>
Stop Screen Share
</button></td>
<td><div
id=
"res_screen_share"
></div></td>
</tr>
</tr>
<td
colspan=
"2"
><button
type=
"button"
id=
"get_aac_mics"
onclick=
"javascript:onTestClick(this);"
>
Get Agora Mics
</button></td>
<td
colspan=
"4"
>
<select
id=
"aac_mics"
name=
"aac_mics"
/>
</td>
</tr>
<tr>
<td
colspan=
"2"
><button
type=
"button"
id=
"start_audio_share"
onclick=
"javascript:onTestClick(this);"
>
Start Audio share
</button></td>
<td
colspan=
"2"
><button
type=
"button"
id=
"stop_audio_share"
onclick=
"javascript:onTestClick(this);"
>
Stop Audio Share
</button></td>
<td><div
id=
"res_audio_share"
></div></td>
</tr>
</table>
...
...
请
注册
或
登录
后发表评论