From 7a7bfba6ed98299c66755e52e7efb677848aae73 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Tue, 13 Sep 2005 11:38:39 +0000 Subject: Nits suggested by Diego git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16474 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/README | 18 ++++++++--------- TOOLS/psnr-video.sh | 58 ++++++++++++++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'TOOLS') diff --git a/TOOLS/README b/TOOLS/README index b4813b13f4..0935a7bbb3 100644 --- a/TOOLS/README +++ b/TOOLS/README @@ -260,15 +260,15 @@ Author: Matthias Wieser Description: Calculates the PSNR between two existing video files. The PSNR is calculated frame by frame. - Prints also the overall PSNR. + Also prints the overall PSNR. The script can be used to: - * compare different softwarescalers (should I use - -sws 1 or -sws 2) ? - * compare different resolutions (is it better to scale + * Compare different softwarescalers (should I use + -sws 1 or -sws 2 ?) + * Compare different resolutions (is it better to scale down to 640x360 or to 560x320) - * compare different deinterlacers - * compare different video codecs - * compare video filters (is it better to use -vf hqdn3d + * Compare different deinterlacers + * Compare different video codecs + * Compare video filters (is it better to use -vf hqdn3d or lavcopts:nr=400) * [...] @@ -281,7 +281,7 @@ Usage: psnr-video.sh [] [] [] [] are additional MPlayer options for [] are additional MPlayer options for - A file called psnr.dat will be created with the following + A file called ./psnr.dat will be created with the following content: File;Y;Cb;Cr @@ -295,7 +295,7 @@ Usage: psnr-video.sh [] [] [] Note: This script relies on the the tool "pnmpsnr" for the frame-by-frame PSNR calculation. - Be aware that psnr-video.sh needs a lot of temporal space + Be aware that psnr-video.sh needs a lot of temporary space inside /temp/. diff --git a/TOOLS/psnr-video.sh b/TOOLS/psnr-video.sh index 1fdc8c106e..4e715d2b3b 100755 --- a/TOOLS/psnr-video.sh +++ b/TOOLS/psnr-video.sh @@ -1,8 +1,8 @@ #!/bin/sh -# Helper script to ease comparing two video files -# Copyleft 2001 by Matthias Wieser +# Helper script to ease comparing the PSNR between two video files +# Copyleft 2005 by Matthias Wieser # This file comes under GPL, see http://www.gnu.org/copyleft/gpl.html for more -# information on it's licensing. +# information on its licensing. TEMPDIR="/tmp/psnr_video" WORKDIR=`pwd`/ @@ -10,12 +10,12 @@ if [ $# -le 1 ]; then echo echo "Usage: `basename $0` [] [] []" echo - echo " and are the video files for which the PSNR should be calculated." + echo " and are the files for which the PSNR should be calculated." echo " [] is the number of frames to process, starting from frame 1." - echo " [] are additional MPlayer options for " - echo " [] are additional MPlayer options for " + echo " [] are additional MPlayer options for ." + echo " [] are additional MPlayer options for ." echo - echo " Be aware that `basename $0` needs a lot of temporal space inside /temp/." + echo " Be aware that `basename $0` needs a lot of temporary space inside /tmp/." echo echo "Example:" echo " ./`basename $0` ./orig.avi ./test.avi 250 \"\" \"-vf pp=ac\"" @@ -31,17 +31,17 @@ LastFrame=-1 if [ $# -ge 3 ]; then LastFrame=$3 echo - echo "Will process $LastFrame frames" + echo "Will process $LastFrame frames." fi if [ $# -ge 4 ]; then - FILE1Opts=$4 - echo "Mplayer options for ${FILE1}: $FILE1Opts" + FILE1_Options=$4 + echo "MPlayer options for ${FILE1}: $FILE1_Options" fi if [ $# -ge 5 ]; then - FILE2Opts=$5 - echo "Mplayer options for ${FILE2}: $FILE2Opts" + FILE2_Options=$5 + echo "Mplayer options for ${FILE2}: $FILE2_Options" fi mkdir -p ${TEMPDIR}/FILE1 @@ -53,13 +53,13 @@ echo "############## $FILE1 #################" cd ${TEMPDIR}/FILE1 -rm *ppm 2> /dev/null -rm *del 2> /dev/null +rm -f *ppm +rm -f *del if [ $LastFrame -ge 0 ]; then - mplayer $FILE1Opts -frames $LastFrame -nosound -vo pnm ${WORKDIR}$FILE1 >/dev/null + mplayer $FILE1_Options -frames $LastFrame -nosound -vo pnm ${WORKDIR}$FILE1 >/dev/null else - mplayer $FILE1Opts -nosound -vo pnm ${WORKDIR}$FILE1 >/dev/null + mplayer $FILE1_Options -nosound -vo pnm ${WORKDIR}$FILE1 > /dev/null fi ### File 2 @@ -71,25 +71,25 @@ cd ${TEMPDIR}/FILE2 rm *ppm 2> /dev/null if [ $LastFrame -ge 0 ]; then - mplayer $FILE2Opts -frames $LastFrame -nosound -vo pnm ${WORKDIR}$FILE2 >/dev/null + mplayer $FILE2_Options -frames $LastFrame -nosound -vo pnm ${WORKDIR}$FILE2 >/dev/null else - mplayer $FILE2Opts -nosound -vo pnm ${WORKDIR}$FILE2 >/dev/null + mplayer $FILE2_Options -nosound -vo pnm ${WORKDIR}$FILE2 >/dev/null fi ### PSNR echo -echo "############## Calculation PSNR #################" +echo "############## PSNR Calculation #################" -if [[ `ls -1 ${TEMPDIR}/FILE1/*ppm|wc -l` = `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` ]] +if [[ `ls -1 ${TEMPDIR}/FILE1/*ppm | wc -l` = `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` ]] then echo else echo "Files have differing numbers of frames!" - echo "$FILE1 has `ls -1 ${TEMPDIR}/FILE1/*ppm|wc -l` frames," - echo "$FILE2 has `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` frames." - echo "Processing the first `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` frames." + echo "$FILE1 has `ls -1 ${TEMPDIR}/FILE1/*ppm | wc -l` frames," + echo "$FILE2 has `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` frames." + echo "Processing the first `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` frames." echo fi @@ -118,7 +118,7 @@ for FILE in `ls -1 *.ppm` echo "$ALL">>../psnr.dat ERROR=`echo "scale=30; (e(-1*$Y/10*l(10))+e(-1*$CB/10*l(10))/4+e(-1*$CR/10*l(10))/4)/1.5"|bc -l` ERRORSUM=`cat errorsum.del` - echo `echo "scale=30; $ERROR + $ERRORSUM"|bc -l` > errorsum.del + echo `echo "scale=30; $ERROR + $ERRORSUM" | bc -l` > errorsum.del i=$(($i+1)) if [[ $i = $LastFrame ]] then @@ -126,19 +126,19 @@ for FILE in `ls -1 *.ppm` fi done ERRORSUM=`cat errorsum.del` -PSNR=`echo "-10*l($ERRORSUM/$i)/l(10)"|bc -l` +PSNR=`echo "-10*l($ERRORSUM/$i)/l(10)" | bc -l` echo "PSNR:;$PSNR">>../psnr.dat cd .. mv psnr.dat ${WORKDIR} -if [[ `ls -1 ${TEMPDIR}/FILE1/*ppm|wc -l` = `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` ]] +if [[ `ls -1 ${TEMPDIR}/FILE1/*ppm | wc -l` = `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` ]] then echo else echo "Files have differing numbers of frames!" - echo "$FILE1 has `ls -1 ${TEMPDIR}/FILE1/*ppm|wc -l` frames," - echo "$FILE2 has `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` frames." - echo "Processed the first `ls -1 ${TEMPDIR}/FILE2/*ppm|wc -l` frames." + echo "$FILE1 has `ls -1 ${TEMPDIR}/FILE1/*ppm | wc -l` frames," + echo "$FILE2 has `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` frames." + echo "Processed the first `ls -1 ${TEMPDIR}/FILE2/*ppm | wc -l` frames." echo fi -- cgit v1.2.3