From f35b26577089f5f20ba544ebef65bb8c0a8ab75c Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Sun, 4 Feb 2024 17:48:13 +0100 Subject: [PATCH] Remove camera-ustreamer as it isn't ready for use --- camera-ustreamer/DOCS.md | 3 - camera-ustreamer/Dockerfile | 96 ----------------- camera-ustreamer/README.md | 7 -- camera-ustreamer/config.yaml | 28 ----- camera-ustreamer/rootfs/etc/caddy/Caddyfile | 19 ---- .../rootfs/etc/cont-init.d/proxy.sh | 22 ---- .../rootfs/etc/services.d/janus/run | 9 -- .../rootfs/etc/services.d/proxy/run | 8 -- .../rootfs/etc/services.d/ustreamer/run | 10 -- .../etc/janus/janus.plugin.ustreamer.jcfg | 3 - camera-ustreamer/rootfs/server/index.html | 100 ------------------ 11 files changed, 305 deletions(-) delete mode 100644 camera-ustreamer/DOCS.md delete mode 100644 camera-ustreamer/Dockerfile delete mode 100644 camera-ustreamer/README.md delete mode 100644 camera-ustreamer/config.yaml delete mode 100644 camera-ustreamer/rootfs/etc/caddy/Caddyfile delete mode 100644 camera-ustreamer/rootfs/etc/cont-init.d/proxy.sh delete mode 100644 camera-ustreamer/rootfs/etc/services.d/janus/run delete mode 100644 camera-ustreamer/rootfs/etc/services.d/proxy/run delete mode 100644 camera-ustreamer/rootfs/etc/services.d/ustreamer/run delete mode 100644 camera-ustreamer/rootfs/opt/janus/etc/janus/janus.plugin.ustreamer.jcfg delete mode 100644 camera-ustreamer/rootfs/server/index.html diff --git a/camera-ustreamer/DOCS.md b/camera-ustreamer/DOCS.md deleted file mode 100644 index 18156e9..0000000 --- a/camera-ustreamer/DOCS.md +++ /dev/null @@ -1,3 +0,0 @@ -# Documentation - -@TODO diff --git a/camera-ustreamer/Dockerfile b/camera-ustreamer/Dockerfile deleted file mode 100644 index f15b5c5..0000000 --- a/camera-ustreamer/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base" -ARG JANUS_GATEWAY_VERSION="1.1.3" -ARG USTREAMER_VERSION="5.38" - -FROM ${BUILD_FROM} AS builder -ARG JANUS_GATEWAY_VERSION -ARG USTREAMER_VERSION -ENV LANG C.UTF-8 - -# Janus -RUN apk add -U --virtual .build-deps-janus \ - build-base \ - autoconf \ - automake \ - libtool \ - libconfig-dev \ - glib-dev \ - libnice-dev \ - jansson-dev \ - openssl-dev \ - zlib-dev \ - libsrtp-dev \ - curl-dev \ - libogg-dev \ - libwebsockets-dev \ - libusrsctp-dev -RUN wget -qO- https://github.com/meetecho/janus-gateway/archive/v${JANUS_GATEWAY_VERSION}.tar.gz | tar xz -C /tmp -WORKDIR /tmp/janus-gateway-${JANUS_GATEWAY_VERSION} -RUN sh autogen.sh -RUN ./configure --prefix=/opt/janus -RUN make -RUN make install -RUN make configs - -# Ustreamer -RUN apk add -U --virtual .build-deps-ustreamer \ - sed \ - build-base \ - libevent-dev \ - libbsd-dev \ - libjpeg-turbo-dev \ - musl-dev \ - alsa-lib-dev \ - speexdsp-dev \ - opus-dev \ - glib-dev \ - jansson-dev -RUN wget -qO- https://github.com/pikvm/ustreamer/archive/v${USTREAMER_VERSION}.tar.gz | tar xz -C /tmp -WORKDIR /tmp/ustreamer-${USTREAMER_VERSION} -RUN ln -s /opt/janus/include/janus /usr/include/janus -RUN sed --in-place --expression 's|^#include "refcount.h"$|#include "../refcount.h"|g' /usr/include/janus/plugins/plugin.h -RUN make WITH_PTHREAD_NP=0 WITH_JANUS=1 -RUN make install -RUN mv janus/libjanus_ustreamer.so /opt/janus/lib/janus/plugins/libjanus_ustreamer.so - -FROM ${BUILD_FROM} AS final -ENV LANG C.UTF-8 - -COPY --from=builder /opt/janus /opt/janus -COPY --from=builder /usr/local/bin/ustreamer /usr/local/bin/ustreamer - -RUN apk add -U \ - alsa-lib \ - curl \ - glib \ - glib \ - jansson \ - jansson \ - libbsd \ - libconfig \ - libevent \ - libjpeg-turbo \ - libnice \ - libogg \ - libsrtp \ - libtool \ - libusrsctp \ - libwebsockets \ - musl \ - openssl \ - opus \ - speexdsp \ - zlib \ - caddy \ - vim \ - screen - -COPY rootfs/ / - -RUN cp /opt/janus/share/janus/javascript/janus.js /server - -WORKDIR / - -# Make files executable -RUN chmod +x /etc/cont-init.d/*.sh -RUN chmod +x /etc/services.d/*/* diff --git a/camera-ustreamer/README.md b/camera-ustreamer/README.md deleted file mode 100644 index 1f05d8f..0000000 --- a/camera-ustreamer/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# ustreamer - -**Work in progress!** - -Provides camera stream through `ustreamer`, to be used by e.g. OctoPrint addon. - -Instructions are provided in the tab "Docs". diff --git a/camera-ustreamer/config.yaml b/camera-ustreamer/config.yaml deleted file mode 100644 index c9cd7b3..0000000 --- a/camera-ustreamer/config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: "Camera-ustreamer" -version: "2023.3.0-rc1" -slug: "camera-ustreamer" -description: "Camera streaming addon for Home Assistant, based on ustreamer." -url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/camera-ustreamer" -ingress: true -ingress_stream: true -panel_icon: mdi:camera -panel_title: ustreamer -arch: - - armv7 - - amd64 - - armhf - - aarch64 - - i386 -stage: experimental -init: false -video: true -usb: true -ports: - 80/tcp: null -ports_description: - 80/tcp: Web-based interface (Not required for Ingress) -# options: -# mjpg_input: "input_uvc.so -n" -# schema: -# mjpg_input: "str" -image: ghcr.io/fredrikbaberg/ha-addon-camera-ustreamer-{arch} diff --git a/camera-ustreamer/rootfs/etc/caddy/Caddyfile b/camera-ustreamer/rootfs/etc/caddy/Caddyfile deleted file mode 100644 index fa6f7af..0000000 --- a/camera-ustreamer/rootfs/etc/caddy/Caddyfile +++ /dev/null @@ -1,19 +0,0 @@ -# Ingress -:8099 { - # @blocked not remote_ip 172.30.32.2 - # respond @blocked "This is only for access through Ingress" 403 - handle_path /janus/* { - reverse_proxy localhost:8188 # Janus API - } - reverse_proxy 127.0.0.1:8080 # ustreamer -} - -# External access -:80 { - # root * /opt/janus/share/janus/demos - root * /server - handle_path /janus/* { - reverse_proxy localhost:8188 # Janus API - } - file_server # Janus demo -} diff --git a/camera-ustreamer/rootfs/etc/cont-init.d/proxy.sh b/camera-ustreamer/rootfs/etc/cont-init.d/proxy.sh deleted file mode 100644 index 880841e..0000000 --- a/camera-ustreamer/rootfs/etc/cont-init.d/proxy.sh +++ /dev/null @@ -1,22 +0,0 @@ -# #!/usr/bin/with-contenv bashio -# # ============================================================================== -# # Add-on: aiortc -# # Configures NGINX for use with aiortc -# # ============================================================================== - -# # Generate Ingress configuration -# bashio::var.json \ -# interface "$(bashio::addon.ip_address)" \ -# port "^$(bashio::addon.ingress_port)" \ -# | tempio \ -# -template /etc/nginx/templates/ingress.gtpl \ -# -out /etc/nginx/servers/ingress.conf - -# # Generate direct access configuration, if enabled. -# if bashio::var.has_value "$(bashio::addon.port 80)"; then -# bashio::var.json \ -# port "^$(bashio::addon.port 80)" \ -# | tempio \ -# -template /etc/nginx/templates/direct.gtpl \ -# -out /etc/nginx/servers/direct.conf -# fi diff --git a/camera-ustreamer/rootfs/etc/services.d/janus/run b/camera-ustreamer/rootfs/etc/services.d/janus/run deleted file mode 100644 index f7aa02d..0000000 --- a/camera-ustreamer/rootfs/etc/services.d/janus/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: camera-ustreamer -# Runs janus -# ============================================================================== - -bashio::log.info "Starting janus.." - -exec /opt/janus/bin/janus --configs-folder /opt/janus/etc/janus/ --plugins-folder /opt/janus/lib/janus/plugins/ diff --git a/camera-ustreamer/rootfs/etc/services.d/proxy/run b/camera-ustreamer/rootfs/etc/services.d/proxy/run deleted file mode 100644 index bf53c03..0000000 --- a/camera-ustreamer/rootfs/etc/services.d/proxy/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: camera-ustreamer -# Runs the proxy daemon -# ============================================================================== - -bashio::log.info "Starting proxy..." -exec caddy run -config /etc/caddy/Caddyfile diff --git a/camera-ustreamer/rootfs/etc/services.d/ustreamer/run b/camera-ustreamer/rootfs/etc/services.d/ustreamer/run deleted file mode 100644 index 1e2d900..0000000 --- a/camera-ustreamer/rootfs/etc/services.d/ustreamer/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: mjpg-streamer -# Runs mjpg-streamer -# ============================================================================== - -bashio::log.info "Starting mjpg-streamer.." - -# mjpg_streamer -i "$(bashio::config 'mjpg_input')" -o "output_http.so -w /www_mjpg -p 80" -exec ustreamer --host=127.0.0.1 --h264-sink demo::ustreamer::h264 --h264-sink-mode 660 --h264-sink-rm \ No newline at end of file diff --git a/camera-ustreamer/rootfs/opt/janus/etc/janus/janus.plugin.ustreamer.jcfg b/camera-ustreamer/rootfs/opt/janus/etc/janus/janus.plugin.ustreamer.jcfg deleted file mode 100644 index 0b87836..0000000 --- a/camera-ustreamer/rootfs/opt/janus/etc/janus/janus.plugin.ustreamer.jcfg +++ /dev/null @@ -1,3 +0,0 @@ -memsink: { - object = "demo::ustreamer::h264" -} \ No newline at end of file diff --git a/camera-ustreamer/rootfs/server/index.html b/camera-ustreamer/rootfs/server/index.html deleted file mode 100644 index 169c627..0000000 --- a/camera-ustreamer/rootfs/server/index.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - µStreamer H.264 demo - - - - - - - - - - \ No newline at end of file