Skip to content

Moved the -tcp_keepalive ffmpeg option behind a version check (8.1 or higher) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morgant wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved the -tcp_keepalive ffmpeg option behind a version check (8.1 or higher) #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions fauxstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ if [[ -z "$filename" ]]; then
echo $USAGE; exit 0
fi

ffmpeg_vers=$(ffmpeg -version | grep 'ffmpeg version ' | cut -d ' ' -f 3)
ffmpeg_major=$(echo "$ffmpeg_vers" | cut -d . -f 1)
ffmpeg_minor=$(echo "$ffmpeg_vers" | cut -d . -f 2)

for p in ${preset[@]}; do
case "$p" in
vaapi) preset_vaapi=1;;
Expand Down Expand Up @@ -186,12 +190,16 @@ elif $(echo "$videocodec" | egrep -q "(hevc|x265)") ; then
fi

if $(echo "$filename" | egrep -q '^rtmpt?[es]?://') ; then
rtmp_conf="-rtmp_live live"

# OTHER POSSIBLE OPTIONS TO TRY FOR $rtmp_conf:
# -muxdelay and -muxpreload idea from: https://www.reddit.com/r/ffmpeg/comments/17bx4i7/broken_pipe_conversion_failed_errors_when/
# -reconnect and -reconnect_streamed from: https://www.virtvps.com/ffmpeg-conquer-the-frustrating-broken-pipe-er/
# tcp_nodelay: see tcp(4)
# tcp_keepalive: see SO_KEEPALIVE under getsockopt(2)
rtmp_conf="-rtmp_live live -tcp_keepalive 1"
# tcp_keepalive: see SO_KEEPALIVE under getsockopt(2) (introduced in ffmpeg 8.1 "Hoare")
if [ "$ffmpeg_major" -gt 8 ] || { [ "$ffmpeg_major" -eq 8 ] && [ "$ffmpeg_minor" -ge 1 ]; } ; then
rtmp_conf="${rtmp_conf} -tcp_keepalive 1"
fi
fi

bufsize=`expr $video_bitrate \* 2`
Expand Down