Commit d506ef05 authored by Reimar Döffinger's avatar Reimar Döffinger

Fixes for third argument do_image_formats.

Remove it from two places where it is useless, do not apply
it to the encode command and make it apply to the output
instead of the input of the decode command.
Should fix the dpx test.
Signed-off-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent f0bb1a59
...@@ -50,9 +50,9 @@ do_image_formats() ...@@ -50,9 +50,9 @@ do_image_formats()
outfile="$datadir/images/$1/" outfile="$datadir/images/$1/"
mkdir -p "$outfile" mkdir -p "$outfile"
file=${outfile}%02d.$1 file=${outfile}%02d.$1
run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS $3 -t 0.5 -y -qscale 10 $target_path/$file run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -t 0.5 -y -qscale 10 $target_path/$file
do_md5sum ${outfile}02.$1 do_md5sum ${outfile}02.$1
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
wc -c ${outfile}02.$1 wc -c ${outfile}02.$1
} }
...@@ -213,7 +213,7 @@ do_image_formats sgi ...@@ -213,7 +213,7 @@ do_image_formats sgi
fi fi
if [ -n "$do_jpg" ] ; then if [ -n "$do_jpg" ] ; then
do_image_formats jpg "-pix_fmt yuvj420p" "-f image2" do_image_formats jpg "-pix_fmt yuvj420p"
fi fi
if [ -n "$do_pam" ] ; then if [ -n "$do_pam" ] ; then
...@@ -226,7 +226,7 @@ fi ...@@ -226,7 +226,7 @@ fi
if [ -n "$do_dpx" ] ; then if [ -n "$do_dpx" ] ; then
do_image_formats dpx do_image_formats dpx
do_image_formats dpx "-pix_fmt rgb48le" "-pix_fmt rgb48le" do_image_formats dpx "-pix_fmt rgb48le"
do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le" do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le"
fi fi
......
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