Fix transpose options for rM2

This commit is contained in:
Rien Maertens 2020-12-31 17:51:23 +01:00
parent 1b213ad7ac
commit 38ff447ae6
No known key found for this signature in database
GPG Key ID: AE66CE42F1AF9DEF

View File

@ -8,6 +8,7 @@ format=- # automatic output format
webcam=false # not to a webcam webcam=false # not to a webcam
measure_throughput=false # measure how fast data is being transferred measure_throughput=false # measure how fast data is being transferred
window_title=reStream # stream window title is reStream window_title=reStream # stream window title is reStream
video_filters="" # list of ffmpeg filters to apply
# loop through arguments and process them # loop through arguments and process them
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
@ -93,13 +94,12 @@ case "$rm_version" in
width=1408 width=1408
height=1872 height=1872
pixel_format="rgb565le" pixel_format="rgb565le"
transpose=0
;; ;;
"reMarkable 2.0") "reMarkable 2.0")
pixel_format="gray8" pixel_format="gray8"
width=1872 width=1872
height=1404 height=1404
transpose=1 video_filters="$video_filters,transpose=2"
;; ;;
*) *)
echo "Unsupported reMarkable version: $rm_version." echo "Unsupported reMarkable version: $rm_version."
@ -141,15 +141,12 @@ else
host_passthrough="cat" host_passthrough="cat"
fi fi
# list of ffmpeg filters to apply
video_filters=""
# store extra ffmpeg arguments in $@ # store extra ffmpeg arguments in $@
set -- set --
# rotate 90 degrees if landscape=true # rotate 90 degrees if landscape=true
$landscape && transpose="$((transpose + 1))" $landscape && video_filters="$video_filters,transpose=1"
[ $transpose != 0 ] && video_filters="$video_filters,transpose=$transpose"
# Scale and add padding if we are targeting a webcam because a lot of services # Scale and add padding if we are targeting a webcam because a lot of services
# expect a size of exactly 1280x720 (tested in Firefox, MS Teams, and Skype for # expect a size of exactly 1280x720 (tested in Firefox, MS Teams, and Skype for