push latest changes

parent 5245177e
...@@ -12,6 +12,8 @@ fi ...@@ -12,6 +12,8 @@ fi
HLS="n" HLS="n"
MP4="n" MP4="n"
EQ="n" EQ="n"
FLAT="n"
FLATWIDE="n"
HLSDIR="HLS" HLSDIR="HLS"
scales="5760x2880 5120x2560 4096x2048 3840x1920 2880x1440" scales="5760x2880 5120x2560 4096x2048 3840x1920 2880x1440"
degree="180" degree="180"
...@@ -40,6 +42,14 @@ case "${1}" in ...@@ -40,6 +42,14 @@ case "${1}" in
MP4="y" MP4="y"
echo "Allsizes mode" echo "Allsizes mode"
;; ;;
flat)
FLAT="y"
echo "FLAT"
;;
flatwide)
FLATWIDE="y"
echo "FLATWIDE"
;;
equi) equi)
echo "Fisheye to Equirectangolar mode" echo "Fisheye to Equirectangolar mode"
EQ="y" EQ="y"
...@@ -61,7 +71,7 @@ case "${1}" in ...@@ -61,7 +71,7 @@ case "${1}" in
HLS="y" HLS="y"
;; ;;
*) *)
echo "Error. Command has to be hls, mp4, all, equi, equihls, equimp4 or equiall" echo "Error. Command has to be flat, flatwide, hls, mp4, all, equi, equihls, equimp4 or equiall"
echo $1 echo $1
exit 1 exit 1
...@@ -73,6 +83,22 @@ if [ "$VENC" == "h264_nvenc" ] ; then ...@@ -73,6 +83,22 @@ if [ "$VENC" == "h264_nvenc" ] ; then
PRESET="slow" PRESET="slow"
fi fi
if [ x"$FLAT" == x"y" ] || [ x"$FLATWIDE" == x"y" ] ; then
inf=$2
outf=$3
h=90
v=50
if [ x"$FLATWIDE" == x"y" ] ; then
h=120
v=68
fi
ffmpeg $YES -i $inf -vf v360=fisheye:flat:ih_fov=$degree:iv_fov=$degree:h_fov=$h:v_fov=$v -vcodec libx264 \
-crf 18 -x264-params mvrange=511 -maxrate 80M -bufsize 25M -ac 2 \
-pix_fmt yuv420p -c:a aac -b:a 160k -movflags faststart \
-preset $PRESET ${outf}
exit 0
fi
if [ x"$4" != x"" ] ; then if [ x"$4" != x"" ] ; then
left=$2 left=$2
right=$3 right=$3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment