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

use ivfs, webm muxing is broken

Browse Source 
Former-commit-id: 1a8210e917b45c9a124308c1047c76bed15cb4cd
This commit is contained in:
Daniel Løvbrøtte Olsen 2020-05-01 21:45:47 +02:00
parent 4c5d8455fb
commit 46657c1de6
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -19,7 +19,7 @@ mod workunit;
use workunit::WUnit; use workunit::WUnit;
use workunit::EStatus; use workunit::EStatus;
const VERSION: &str = "0.8.0"; const VERSION: &str = "0.9.0";
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct SharedState { struct SharedState {

18
src/static/client.sh
View File

@ -4,7 +4,7 @@ set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
base_url="https://av1.dodsorf.as" base_url="https://av1.dodsorf.as"
version="0.8.0" version="0.9.0"
while true; do while true; do
sleep 30 sleep 30
@ -117,10 +117,7 @@ while true; do
set +e set +e
echo 'ffmpeg -nostats -hide_banner -loglevel warning \ echo 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$width':'$height','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$width':'$height','$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" -o "'$input'.out.ivf"'
eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$width':'$height','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
--pass=1 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
retval=$? retval=$?
if [ $retval -ne 0 ]; then if [ $retval -ne 0 ]; then
@ -132,10 +129,7 @@ while true; do
echo 'ffmpeg -nostats -hide_banner -loglevel warning \ echo 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$width':'$height','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$width':'$height','$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" -o "'$input'.out.ivf"'
eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$width':'$height','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
--pass=2 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
retval=$? retval=$?
if [ $retval -ne 0 ]; then if [ $retval -ne 0 ]; then
@ -153,7 +147,7 @@ while true; do
set +e set +e
eval 'ffmpeg -nostats -hide_banner -loglevel warning \ eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-i "'$input'" '$ffmpego' -vf scale='$width':'$height','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \ -i "'$input'" '$ffmpego' -vf scale='$width':'$height','$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" -o "'$input'.out.ivf"'
retval=$? retval=$?
if [ $retval -ne 0 ]; then if [ $retval -ne 0 ]; then
@ -176,7 +170,7 @@ while true; do
echo "Uploading file!" echo "Uploading file!"
set +e set +e
curl --data-binary @"$input".out.webm "$base_url"/upload/"$job_id" curl --data-binary @"$input".out.ivf "$base_url"/upload/"$job_id"
set -e set -e
retval=$? retval=$?
echo "" echo ""
@ -185,7 +179,7 @@ while true; do
continue continue
else else
echo "Upload finished, deleting result!" echo "Upload finished, deleting result!"
rm "$input".out.webm rm "$input".out.ivf
echo "" echo ""
fi fi
done done