jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webrtc: always use iceServers instead of ice_servers

Browse Source
This commit is contained in:
Kamil Trzcinski 2023-06-14 00:18:56 +02:00
parent 836d3177b0
commit 01b0e969b3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/control.html
View File

@ -753,6 +753,10 @@
stopStream(); stopStream();
show(videoContainer); show(videoContainer);
const iceServers = [
[ { urls: ['stun:stun.l.google.com:19302'] } ]
];
fetch(webrtcURL, { fetch(webrtcURL, {
body: JSON.stringify({type: 'request'}), body: JSON.stringify({type: 'request'}),
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},

8
html/webrtc.html
View File

@ -47,10 +47,8 @@
<script> <script>
function startWebRTC() { function startWebRTC() {
// syntax: https://github.com/paullouisageneau/libdatachannel/blob/master/DOC.md#rtcwebrtc_peer_connection const iceServers = [
const ice_servers = [ [ { urls: ['stun:stun.l.google.com:19302'] } ]
// 'stun:stun.l.google.com:19302',
//'turn://7295a68e2381585126c6a19e:zDd3R415oPPXJKQT@a.relay.metered.ca:80'
]; ];
var pc = null; var pc = null;
@ -62,7 +60,7 @@
body: JSON.stringify({ body: JSON.stringify({
type: 'request', type: 'request',
res: params.res, res: params.res,
ice_servers: ice_servers iceServers: iceServers
}), }),
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'

2
output/webrtc/webrtc.cc
View File

@ -212,7 +212,7 @@ static std::shared_ptr<ClientTrackData> webrtc_add_video(const std::shared_ptr<r
static void webrtc_parse_ice_servers(rtc::Configuration &config, const nlohmann::json &message) static void webrtc_parse_ice_servers(rtc::Configuration &config, const nlohmann::json &message)
{ {
auto ice_servers = message.find("ice_servers"); auto ice_servers = message.find("iceServers");
if (ice_servers == message.end() || !ice_servers->is_array()) if (ice_servers == message.end() || !ice_servers->is_array())
return; return;