diff --git a/src/cameras.json b/src/cameras.json index a87c9c5..28539d8 100644 --- a/src/cameras.json +++ b/src/cameras.json @@ -3,38 +3,19 @@ "name": "Garden PTZ", "streams": { "stream1": { - "audio_bitrate": "16000", + "audio_bitrate": "8000", "descr": "HD", - "netcam_uri": "rtsp://192.168.0.23:554/11", + "netcam_uri": "rtsp://192.168.1.21:554/11", "client_uri": "http://localhost:8081/live/stream?suuid=stream1", "uri": "http://localhost:8081/ws/stream/suuid=stream1" }, "stream2": { "audio_bitrate": "0", "descr": "SD", - "netcam_uri": "rtsp://192.168.0.23:554/12", + "netcam_uri": "rtsp://192.168.1.21:554/12", "client_uri": "http://localhost:8081/live/stream?suuid=stream2", "uri": "http://localhost:8081/ws/stream/suuid=stream2" } } - }, - "camera2": { - "name": "Porch", - "streams": { - "stream3": { - "audio_bitrate": "0", - "descr": "HD", - "netcam_uri": "rtsp://192.168.0.26:554/11", - "client_uri": "http://localhost:8081/live/stream?suuid=stream3", - "uri": "http://localhost:8081/ws/stream/suuid=stream3" - }, - "stream4": { - "audio_bitrate": "0", - "descr": "SD", - "netcam_uri": "rtsp://192.168.0.26:554/12", - "client_uri": "http://localhost:8081/live/stream?suuid=stream4", - "uri": "http://localhost:8081/ws/stream/suuid=stream4" - } - } } } diff --git a/web/index.gohtml b/web/index.gohtml index e901626..f1e1b3c 100644 --- a/web/index.gohtml +++ b/web/index.gohtml @@ -118,6 +118,34 @@ https://stackoverflow.com/questions/54186634/sending-periodic-metadata-in-fragme buffering_sec_seek_distance = buffering_sec * 0.5; } + function Utf8ArrayToStr(array) { + let out, i, len, c; + let char2, char3; + out = ""; + len = array.length; + i = 0; + while (i < len) { + c = array[i++]; + switch (c >> 4) { + case 7: + out += String.fromCharCode(c); + break; + case 13: + char2 = array[i++]; + out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F)); + break; + case 14: + char2 = array[i++]; + char3 = array[i++]; + out += String.fromCharCode(((c & 0x0F) << 12) | + ((char2 & 0x3F) << 6) | + ((char3 & 0x3F) << 0)); + break; + } + } + return out; + } + let started = false; // consider these callbacks: // - putPacket : called when websocket receives data