diff options
| -rwxr-xr-x | bin/decode+edit+encode+stream | 5 | ||||
| -rwxr-xr-x | bin/decode+edit+loop+encode+stream | 3 | ||||
| -rwxr-xr-x | bin/encodevideo+loop+stream | 3 | ||||
| -rwxr-xr-x | bin/loop+encode+stream | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream index 9b3e923..157ad23 100755 --- a/bin/decode+edit+encode+stream +++ b/bin/decode+edit+encode+stream @@ -22,6 +22,7 @@ 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 # + Drop frames, aggressively treat as static, and use fastest cpu +# + Use same RTP payload types as GStreamer ffmpeg -threads auto -re \ -i "$INPUT" \ -i "$LOGO" \ @@ -30,7 +31,7 @@ ffmpeg -threads auto -re \ [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \ -codec:a libopus -ac 2 -b:a "$ABITRATE" -ar 48000 \ -vn \ - -f rtp "rtp://$IP:$FIRSTPORT?pkt_size=1200" \ + -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \ -an \ -pix_fmt yuv420p \ -codec:v vp8 -quality realtime -deadline realtime -cpu-used 15 \ @@ -39,4 +40,4 @@ ffmpeg -threads auto -re \ -max-intra-rate 0 \ -qmin 4 -qmax 56 \ -static-thresh 500 -skip_threshold 50 \ - -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" + -f rtp -payload_type 100 "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" diff --git a/bin/decode+edit+loop+encode+stream b/bin/decode+edit+loop+encode+stream index a6daf07..6a69fe8 100755 --- a/bin/decode+edit+loop+encode+stream +++ b/bin/decode+edit+loop+encode+stream @@ -26,6 +26,7 @@ VBITRATE=256000 # + loop-in-filter trick based on http://video.stackexchange.com/a/16933 # + scale+watermark trick based on http://stackoverflow.com/a/10937357 # + Drop frames, aggressively treat as static, and use fastest cpu +# + Use same RTP payload types as GStreamer ffmpeg -threads auto -re \ -f lavfi -i "movie=filename=$INPUT:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \ -i "$LOGO" \ @@ -40,4 +41,4 @@ ffmpeg -threads auto -re \ -max-intra-rate 0 \ -qmin 4 -qmax 56 \ -static-thresh 500 -skip_threshold 50 \ - -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" + -f rtp -payload_type 100 "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" diff --git a/bin/encodevideo+loop+stream b/bin/encodevideo+loop+stream index f005b4d..761bf6f 100755 --- a/bin/encodevideo+loop+stream +++ b/bin/encodevideo+loop+stream @@ -17,6 +17,7 @@ VBITRATE=256000 # 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 +# + Use same RTP payload types as GStreamer ffmpeg -threads auto -re \ -stream_loop -1 -i "$INPUT" \ -an \ @@ -27,4 +28,4 @@ ffmpeg -threads auto -re \ -max-intra-rate 0 \ -qmin 4 -qmax 56 \ -static-thresh 500 -skip_threshold 50 \ - -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" + -f rtp -payload_type 100 "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" diff --git a/bin/loop+encode+stream b/bin/loop+encode+stream index 38b6496..9485df8 100755 --- a/bin/loop+encode+stream +++ b/bin/loop+encode+stream @@ -21,11 +21,12 @@ VBITRATE=256000 # 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 +# + Use same RTP payload types as GStreamer ffmpeg -threads auto -re \ -stream_loop -1 -i "$INPUT" \ -codec:a libopus -ac 2 -b:a "$ABITRATE" -ar 48000 \ -vn \ - -f rtp "rtp://$IP:$FIRSTPORT?pkt_size=1200" \ + -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \ -an \ -pix_fmt yuv420p \ -codec:v vp8 -quality realtime -deadline realtime -cpu-used 15 \ @@ -34,4 +35,4 @@ ffmpeg -threads auto -re \ -max-intra-rate 0 \ -qmin 4 -qmax 56 \ -static-thresh 500 -skip_threshold 50 \ - -f rtp "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" + -f rtp -payload_type 100 "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200" |