diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-04-27 20:17:58 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-27 20:25:32 +0200 |
| commit | 27f1da68872b32708234108f64ac92ebcf57bf49 (patch) | |
| tree | f502fe090d582ed2fa23a042d6fa7094135ea7f1 /bin | |
| parent | 73c58e6cf15a921197a6e85422cb061fe01b0f53 (diff) | |
Fix scale video and apply watermark, and rename capture+encode+stream → capture+edit+encode+stream.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/capture+edit+encode+stream (renamed from bin/capture+encode+stream) | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/capture+encode+stream b/bin/capture+edit+encode+stream index 740e2f3..fd143c2 100755 --- a/bin/capture+encode+stream +++ b/bin/capture+edit+encode+stream @@ -4,6 +4,7 @@ set -e AINPUT=hw:0 VINPUT=/dev/fw1 +LOGO=../../content/icon_small.png HOST=${1:-morla} if [ "$HOST" = "$(hostname --short)" ]; then @@ -18,18 +19,24 @@ ACHANNELS=2 AFRAMERATE=48000 ABITRATE=32000 +HEIGHT=360 VBITRATE=256000 # based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming +# + scale+watermark trick based on http://stackoverflow.com/a/10937357 # + Add 1s latency (deadline) # + Use same RTP payload types as GStreamer ffmpeg -hide_banner -threads auto -re \ -f alsa -sample_rate "$AFRAMERATE" -channels "$ACHANNELS" -thread_queue_size 1024 -i "$AINPUT" \ -f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$VINPUT" \ + -i "$LOGO" \ + -filter_complex \ + "[1:v]scale=-1:$HEIGHT[bg]; + [bg][2:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \ -map '0:a' \ -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \ -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \ - -map '0:v' \ + -map '[v]' \ -pix_fmt yuv420p \ -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \ -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \ |