From ab00d30e72fea3b9cb33dc065861e92e5d0eeb14 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 14:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/templates/preview.html | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/resources/templates/preview.html b/ard-work/src/main/resources/templates/preview.html
index 609e256..616b08e 100644
--- a/ard-work/src/main/resources/templates/preview.html
+++ b/ard-work/src/main/resources/templates/preview.html
@@ -101,7 +101,7 @@
<button class="toggle-button" onclick="changeGrid(7, 7)">7x7</button>
<button class="toggle-button" onclick="changeGrid(8, 8)">8x8</button>
<button class="toggle-button" onclick="changeGrid(9, 9)">9x9</button>
- <input id="videoUrl" type="text" value="http://192.168.1.227:8889/164/" style="width: 250px"/>
+ <input id="videoUrl" type="text" value="" style="width: 250px"/>
</div>
</div>
</div>
@@ -110,6 +110,7 @@
console.log(RTCRtpReceiver.getCapabilities('video').codecs)
console.log(RTCRtpReceiver.getCapabilities('audio').codecs)
//whep鎿嶄綔鏂规硶
+ const restartPause = 2000;
const linkToIceServers = (links) => (
(links !== null) ? links.split(', ').map((link) => {
const m = link.match(/^<(.+?)>; rel="ice-server"(; username="(.*?)"; credential="(.*?)"; credential-type="password")?/i);
@@ -236,7 +237,7 @@
if (res.status !== 201) {
throw new Error('bad status code');
}
- // this.eTag = res.headers.get('ETag');
+ // this.eTag = res.headers.get('ETag');
this.eTag = res.headers.get("ETag") || res.headers.get('E-Tag');
return res.text();
})
@@ -297,6 +298,7 @@
'Content-Type': 'application/trickle-ice-sdpfrag',
'If-Match': this.eTag,
},
+
body: generateSdpFragment(this.offerData, candidates),
})
.then((res) => {
@@ -349,7 +351,7 @@
chanMap.set("video" + i, videoUrl);
}
console.log(chanMap);
- changeGrid(2, 2);
+ //changeGrid(2, 2);
}
//缁戝畾鐐瑰嚮浜嬩欢
let playMap = new Map();
--
Gitblit v1.9.3