From 2bd5d5c63f4936f026dd9b19f599e2158c6f64b3 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Sun, 27 Sep 2020 10:14:53 +0400
Subject: [PATCH] Updated streaming muxers added html page scetch.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
Makefile | 2 +-
assets/dist/index.html | 14 ++++++++++++++
assets/index.html | 14 ++++++++++++++
assets/scripts/install.sh | 4 ++++
4 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 assets/dist/index.html
create mode 100644 assets/index.html
create mode 100644 assets/scripts/install.sh
diff --git a/Makefile b/Makefile
index 0ef089f..cf8e856 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ install:
pip install --user ffpb
stream:
- vlc --no-dbus -vv --sout-keep --sout '#gather:std{access=http{mime=video/mp4},mux=ts,dst=:8888/}' --sout-all --loop
+ vlc --no-dbus -vv --sout-keep --sout '#transcode{vcodec=theo,venc=theora{quality=9},acodec=vorb,channels=2}:gather:std{access=http{mime=video/ogg},mux=ogg,dst=:8888/}' --sout-all --loop
cleanup:
@echo "Cleaning up outdir"
@rm -rfv "${OUT_DIR}"
diff --git a/assets/dist/index.html b/assets/dist/index.html
new file mode 100644
index 0000000..1a4aae9
--- /dev/null
+++ b/assets/dist/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>s3rius radio</title>
+ </head>
+ <body>
+ <video id="video" controls src="/stream" height="598" width="782" type="video/ogg; codecs=theora" autoplay="autoplay">
+ Your user agent does not support the HTML5 Video element.
+ </video>
+ </body>
+</html>
+
diff --git a/assets/index.html b/assets/index.html
new file mode 100644
index 0000000..1a4aae9
--- /dev/null
+++ b/assets/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>s3rius radio</title>
+ </head>
+ <body>
+ <video id="video" controls src="/stream" height="598" width="782" type="video/ogg; codecs=theora" autoplay="autoplay">
+ Your user agent does not support the HTML5 Video element.
+ </video>
+ </body>
+</html>
+
diff --git a/assets/scripts/install.sh b/assets/scripts/install.sh
new file mode 100644
index 0000000..17fc70a
--- /dev/null
+++ b/assets/scripts/install.sh
@@ -0,0 +1,4 @@
+HELPER_NAME="s3stream_helper"
+docker run -v memes_nginx_shared:/shared/ --name "${HELPER_NAME}" alpine true
+docker cp ./assets/dist "${HELPER_NAME}:/shared/s3rius_stream"
+docker rm "$(docker stop "${HELPER_NAME}")"
--
GitLab