diff --git a/cmd/camera-streamer/http.c b/cmd/camera-streamer/http.c
index 83452a0..65d8104 100644
--- a/cmd/camera-streamer/http.c
+++ b/cmd/camera-streamer/http.c
@@ -9,8 +9,8 @@
extern unsigned char html_index_html[];
extern unsigned int html_index_html_len;
-extern unsigned char html_video_html[];
-extern unsigned int html_video_html_len;
+extern unsigned char html_webrtc_html[];
+extern unsigned int html_webrtc_html_len;
extern camera_t *camera;
void *camera_http_set_option(http_worker_t *worker, FILE *stream, const char *key, const char *value, void *headersp)
@@ -77,12 +77,12 @@ http_method_t http_methods[] = {
{ "GET", "/?action=snapshot", http_snapshot },
{ "GET", "/?action=stream", http_stream },
{ "GET", "/video", http_detect_video },
- { "GET", "/video.html", http_content, "text/html", html_video_html, 0, &html_video_html_len },
{ "GET", "/video.m3u8", http_m3u8_video },
{ "GET", "/video.h264", http_h264_video },
{ "GET", "/video.mkv", http_mkv_video },
{ "GET", "/video.mp4", http_mp4_video },
- { "POST", "/video", http_webrtc_offer },
+ { "GET", "/webrtc", http_content, "text/html", html_webrtc_html, 0, &html_webrtc_html_len },
+ { "POST", "/webrtc", http_webrtc_offer },
{ "GET", "/option", camera_http_option },
{ "GET", "/", http_content, "text/html", html_index_html, 0, &html_index_html_len },
{ }
diff --git a/html/index.html b/html/index.html
index 9bc5d18..02e10c1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -12,22 +12,46 @@
/snapshot
- Get a current actual image from the server.
+ Get a current actual image from the server.
- - /snapshot?res=low get a low low resolution stream (if -camera-low_res_factor=X is configured).
+ - /snapshot?res=low get a low resolution stream (if -camera-low_res_factor=X is configured).
- /stream
- Get a live stream.
+ /stream (MJPEG stream)
+ Get a live stream. Works everywhere, but consumes a ton of bandwidth.
- /stream?res=low get a low low resolution stream (if -camera-low_res_factor=X is configured).
+
+ /webrtc (HTTP page / iframe)
+ Get a live video using WebRTC (low-latency streaming with latency of around 100ms).
+
+
+ - /webrtc?res=low get a low low resolution WebRTC stream (if -camera-low_res_factor=X is configured).
+
+
+
+
+ /video (IP Camera)
+ Get a live (H264) video stream best suited to current browser in a maximum compatibility mode choosing automatically between one of the below formats.
+
+
+ - /video.mp4
get a live video stream in MP4 format (Firefox, with latency of around 1s if FFMPEG enabled).
+
+ - /video.mkv
get a live video stream in MKV format (Chrome, with latency of around 2s if FFMPEG enabled).
+
+ - /video.m3u8
get a live video stream in HLS format (Safari, with latency of around 1s).
+
+ - /video?res=low get a low resolution stream (if -camera-low_res_factor=X is configured).
+
+
+
The mjpg-streamer compatibility layer:
@@ -38,23 +62,6 @@
-
- /video
- Get a live (H264) video stream best suited to current browser in a maximum compatibility mode choosing automatically between one of the below formats.
-
-
- - /video.html
get a live video using WebRTC (low-latency streaming with latency of around 100ms).
-
- - /video.mp4
get a live video stream in MP4 format (Firefox, with latency of around 1s if FFMPEG enabled).
-
- - /video.mkv
get a live video stream in MKV format (Chrome, with latency of around 2s if FFMPEG enabled).
-
- - /video.m3u8
get a live video stream in HLS format (Safari, with latency of around 1s).
-
- - /video.html?res=low get a low resolution stream (if -camera-low_res_factor=X is configured).
-
-
-
The commands available on some cameras:
diff --git a/html/video.html b/html/webrtc.html
similarity index 94%
rename from html/video.html
rename to html/webrtc.html
index 229e161..c2e39bb 100644
--- a/html/video.html
+++ b/html/webrtc.html
@@ -42,7 +42,7 @@
-
+