Dandellion/AV1Master
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fps no longer optional

Browse Source 
Former-commit-id: b99223b39824a078adaff63eef486277958d6429
This commit is contained in:
Daniel Løvbrøtte Olsen 2020-04-21 17:14:21 +02:00
parent 7b2190a78f
commit 80d02c8428
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/static/client.sh
View File

@ -96,21 +96,27 @@ while true; do
aompix="--i444" aompix="--i444"
fi fi
fps=`echo $job | jq -r .description.options.fps` fps=`echo $job | jq -r .description.options.fps`
if [[ $fps = "null" ]]; then if [[ $fps = "null" ]]; then
fpsoption="" fffps=""
aomfps=""
else else
fpsrate=`echo $fps | jq -r '.[0]'` fpsrate=`echo $fps | jq -r '.[0]'`
fpsscale=`echo $fps | jq -r '.[1]'` fpsscale=`echo $fps | jq -r '.[1]'`
fpsoption="$fpsrate/$fpsscale" fpsv="$fpsrate/$fpsscale"
fffps="fps=fps=$fpsv"
aomfps="--fps=$fpsv"
fi fi
two_pass=`echo $job | jq -r .description.options.two_pass` two_pass=`echo $job | jq -r .description.options.two_pass`
if [[ $two_pass = true ]]; then if [[ $two_pass = true ]]; then
set +e set +e
eval 'ffmpeg -nostats -hide_banner -loglevel warning \ eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
--pass=1 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"' --pass=1 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
retval=$? retval=$?
@ -122,7 +128,7 @@ while true; do
fi fi
eval 'ffmpeg -nostats -hide_banner -loglevel warning \ eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
--pass=2 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"' --pass=2 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
retval=$? retval=$?
@ -140,7 +146,7 @@ while true; do
else else
set +e set +e
eval 'ffmpeg -nostats -hide_banner -loglevel warning \ eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
--passes=1 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"' --passes=1 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
retval=$? retval=$?

5
src/workunit.rs
View File

@ -48,8 +48,7 @@ pub struct EOptions {
pub aomenc: String, pub aomenc: String,
pub two_pass: bool, pub two_pass: bool,
pub pix_fmt: EPixFmt, pub pix_fmt: EPixFmt,
#[serde(default)] pub fps: (u16, u16)
pub fps: Option<(u16, u16)>
} }
impl Default for EOptions { impl Default for EOptions {
fn default() -> Self { fn default() -> Self {
@ -58,7 +57,7 @@ impl Default for EOptions {
aomenc: "--lag-in-frames=25 --tile-columns=0 --tile-rows=0 --enable-fwd-kf=1 --bit-depth=10 --cpu-used=3 --cq-level=30 --end-usage=q".to_string(), aomenc: "--lag-in-frames=25 --tile-columns=0 --tile-rows=0 --enable-fwd-kf=1 --bit-depth=10 --cpu-used=3 --cq-level=30 --end-usage=q".to_string(),
two_pass: false, two_pass: false,
pix_fmt: EPixFmt::I422, pix_fmt: EPixFmt::I422,
fps: Option::None fps: (25, 1)
} }
} }
} }