Merge branch 'cloudsftp-feature/window-title'

This commit is contained in:
Rien Maertens 2020-12-31 15:22:38 +01:00
commit 24b4846ec7
No known key found for this signature in database
GPG Key ID: AE66CE42F1AF9DEF
2 changed files with 12 additions and 2 deletions

View File

@ -29,6 +29,7 @@ reMarkable screen sharing over SSH.
- `-f --format`: when recording to an output, this option is used to force the encoding format; if this is `-`, `ffmpeg`s auto format detection based on the file extension is used (default: `-`).
- `-w --webcam`: record to a video4linux2 web cam device. By default the first found web cam is taken, this can be overwritten with `-o`. The video is scaled to 1280x720 to ensure compatibility with MS Teams, Skype for business and other programs which need this specific format.
- `-t --throughput`: use `pv` to measure how much data throughput you have (good to experiment with parameters to speed up the pipeline)
- `--window_title`: set a custom window title for the video stream. The default title is "reStream". This option is disabled when using `-o --output`
If you have problems, don't hesitate to [open an issue](https://github.com/rien/reStream/issues/new) or [send me an email](mailto:rien.maertens@posteo.be).

View File

@ -7,6 +7,7 @@ output_path=- # display output through ffplay
format=- # automatic output format
webcam=false # not to a webcam
measure_throughput=false # measure how fast data is being transferred
window_title=reStream # stream window title is reStream
# loop through arguments and process them
while [ $# -gt 0 ]; do
@ -30,7 +31,7 @@ while [ $# -gt 0 ]; do
shift
shift
;;
-t | --throughput)
-m | --measure)
measure_throughput=true
shift
;;
@ -55,8 +56,13 @@ while [ $# -gt 0 ]; do
fi
shift
;;
-t | --title)
window_title="$2"
shift
shift
;;
-h | --help | *)
echo "Usage: $0 [-p] [-s <source>] [-o <output>] [-f <format>]"
echo "Usage: $0 [-p] [-s <source>] [-o <output>] [-f <format>] [-t <title>]"
echo "Examples:"
echo " $0 # live view in landscape"
echo " $0 -p # live view in portrait"
@ -159,6 +165,8 @@ set -- "$@" -vf "${video_filters#,}"
if [ "$output_path" = - ]; then
output_cmd=ffplay
window_title_option="-window_title $window_title"
else
output_cmd=ffmpeg
@ -181,5 +189,6 @@ ssh_cmd "$read_loop" \
-f rawvideo \
-pixel_format rgb565le \
-video_size "$width,$height" \
$window_title_option \
-i - \
"$@"