Merge branch 'go-webp' into beta
# Conflicts: # .gitignore # go.sum
This commit is contained in:
@@ -66,7 +66,9 @@
|
||||
<h2>MJPEG source</h2>
|
||||
<li><a href="stream.html?src=${src}&mode=mjpeg">stream.html</a> with MJPEG mode / browsers: all / codecs: MJPEG, JPEG</li>
|
||||
<li><a href="api/stream.mjpeg?src=${src}">stream.mjpeg</a> MJPEG stream / browsers: all / codecs: MJPEG, JPEG</li>
|
||||
<li><a href="api/stream.webp?src=${src}">stream.webp</a> Motion-WebP stream / browsers: all modern / codecs: MJPEG, JPEG</li>
|
||||
<li><a href="api/frame.jpeg?src=${src}">frame.jpeg</a> snapshot in JPEG-format / browsers: all / codecs: MJPEG, JPEG</li>
|
||||
<li><a href="api/frame.webp?src=${src}">frame.webp</a> snapshot in WebP-format / browsers: all modern / codecs: H264, H265, MJPEG, JPEG</li>
|
||||
`;
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -151,6 +151,7 @@
|
||||
"mp4",
|
||||
"hls",
|
||||
"mjpeg",
|
||||
"webp",
|
||||
"hass",
|
||||
"homekit",
|
||||
"onvif",
|
||||
@@ -462,6 +463,9 @@
|
||||
"mjpeg": {
|
||||
"$ref": "#/definitions/log_level"
|
||||
},
|
||||
"webp": {
|
||||
"$ref": "#/definitions/log_level"
|
||||
},
|
||||
"mp4": {
|
||||
"$ref": "#/definitions/log_level"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user