diff --git a/.github/workflows/docker-alpine-image.yaml b/.github/workflows/docker-alpine-image.yaml index 1404c02..3a0ed2b 100644 --- a/.github/workflows/docker-alpine-image.yaml +++ b/.github/workflows/docker-alpine-image.yaml @@ -59,8 +59,8 @@ jobs: - name: Test run: | - echo version: $(docker run --rm -e NO_EDID=1 -t ustreamer --version) - echo -e "features:\n$(docker run --rm -e NO_EDID=1 -t ustreamer --features)" + echo version: $(docker run --rm -t ustreamer --version) + echo -e "features:\n$(docker run --rm -t ustreamer --features)" - name: Build multi arch uses: docker/build-push-action@v3 diff --git a/README.md b/README.md index edf0367..65ffa5f 100644 --- a/README.md +++ b/README.md @@ -102,11 +102,20 @@ Save changes and reboot. ## Launch Start container: ```bash -$ docker run --device /dev/video0:/dev/video0 -p 8080:8080 pikvm/ustreamer:latest +$ docker run --device /dev/video0:/dev/video0 -e EDID=1 -p 8080:8080 pikvm/ustreamer:latest ``` Then access the web interface at port 8080 (e.g. http://raspberrypi.local:8080). +## Custom config +```bash +$ docker run --rm pikvm/ustreamer:latest \ + --format=uyvy \ + --workers=3 \ + --persistent \ + --dv-timings \ + --drop-same-frames=30 +``` ## EDID -Container will set HDMI EDID before starging ustreamer. Use `-e NO_EDID=1` to not set EDID. Use `-e EDID_HEX=xx` to specify custom EDID data. +Add `-e EDID=1` to set HDMI EDID before starging ustreamer. Use together with `-e EDID_HEX=xx` to specify custom EDID data. ----- # Raspberry Pi Camera Example diff --git a/pkg/docker/entry.sh b/pkg/docker/entry.sh index 792c7fa..4ea91af 100755 --- a/pkg/docker/entry.sh +++ b/pkg/docker/entry.sh @@ -2,7 +2,7 @@ set -e -[ -z "$NO_EDID" ] && { +[ -n "$EDID" ] && { [ -n "$EDID_HEX" ] && echo "$EDID_HEX" > /edid.hex while true; do v4l2-ctl --device=/dev/video0 --set-edid=file=/edid.hex --fix-edid-checksums --info-edid && break