From a1d3c7fb53c459ad7d2090b85be627068286ba63 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 16 Apr 2017 15:13:11 +0200
Subject: Rename encode+stream as loop+encode+stream.

---
 bin/encode+stream      | 36 ------------------------------------
 bin/loop+encode+stream | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100755 bin/encode+stream
 create mode 100755 bin/loop+encode+stream

(limited to 'bin')

diff --git a/bin/encode+stream b/bin/encode+stream
deleted file mode 100755
index 9387dcb..0000000
--- a/bin/encode+stream
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# TODO: Handle audio from secondary input
-
-set -e
-
-HOST=${1:-morla}
-if [ "$HOST" = "$(hostname --short)" ]; then
-	IP=127.0.0.1
-else
-	IP=$(host "$HOST" | grep -Po 'address \K\S+')
-fi
-
-FIRSTPORT=${2:-5002} # even number - next 3 ports used too
-
-ABITRATE=64000
-
-VBITRATE=500000
-
-TMPMOVIE=../tmp/omni/show0/earth.yuv
-
-# based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
-# + Drop frames, aggressively treat as static, and use fastest cpu
-ffmpeg -threads auto -re \
- -stream_loop -1 -i "$TMPMOVIE" \
- -codec:a libopus -ac 2 -b:a "$ABITRATE" -ar 48000 \
- -vn \
- -f rtp "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -an \
- -codec:v vp8 -quality realtime -deadline realtime -cpu-used 15 \
- -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
- -undershoot-pct 95 -bufsize $((6000*VBITRATE/1000)) -rc_init_occupancy $((4000*VBITRATE/1000)) \
- -max-intra-rate 0 \
- -qmin 4 -qmax 56 \
- -static-thresh 500 -skip_threshold 50 \
- -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200"
diff --git a/bin/loop+encode+stream b/bin/loop+encode+stream
new file mode 100755
index 0000000..9387dcb
--- /dev/null
+++ b/bin/loop+encode+stream
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# TODO: Handle audio from secondary input
+
+set -e
+
+HOST=${1:-morla}
+if [ "$HOST" = "$(hostname --short)" ]; then
+	IP=127.0.0.1
+else
+	IP=$(host "$HOST" | grep -Po 'address \K\S+')
+fi
+
+FIRSTPORT=${2:-5002} # even number - next 3 ports used too
+
+ABITRATE=64000
+
+VBITRATE=500000
+
+TMPMOVIE=../tmp/omni/show0/earth.yuv
+
+# based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
+# + Drop frames, aggressively treat as static, and use fastest cpu
+ffmpeg -threads auto -re \
+ -stream_loop -1 -i "$TMPMOVIE" \
+ -codec:a libopus -ac 2 -b:a "$ABITRATE" -ar 48000 \
+ -vn \
+ -f rtp "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
+ -an \
+ -codec:v vp8 -quality realtime -deadline realtime -cpu-used 15 \
+ -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
+ -undershoot-pct 95 -bufsize $((6000*VBITRATE/1000)) -rc_init_occupancy $((4000*VBITRATE/1000)) \
+ -max-intra-rate 0 \
+ -qmin 4 -qmax 56 \
+ -static-thresh 500 -skip_threshold 50 \
+ -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200"
-- 
cgit v1.2.3