[MPlayer-cvslog] r27228 - in trunk/TOOLS: aconvert divx2svcd encode2mpeglight qepdvcd.sh
diego
subversion at mplayerhq.hu
Mon Jul 7 08:43:45 CEST 2008
Author: diego
Date: Mon Jul 7 08:43:45 2008
New Revision: 27228
Log:
Replace == in []/test constructs with =, == is a bashism.
Modified:
trunk/TOOLS/aconvert
trunk/TOOLS/divx2svcd
trunk/TOOLS/encode2mpeglight
trunk/TOOLS/qepdvcd.sh
Modified: trunk/TOOLS/aconvert
==============================================================================
--- trunk/TOOLS/aconvert (original)
+++ trunk/TOOLS/aconvert Mon Jul 7 08:43:45 2008
@@ -3,7 +3,7 @@
# Author: Jonas Jermann
# Description: A hack to allow mencoder to encode from an audio only file
-if [[ $1 == "" ]]; then
+if [[ $1 = "" ]]; then
echo "Usage: $0 <\"input file\"> <\"output file\"> <\"options\">"
exit 0
fi
Modified: trunk/TOOLS/divx2svcd
==============================================================================
--- trunk/TOOLS/divx2svcd (original)
+++ trunk/TOOLS/divx2svcd Mon Jul 7 08:43:45 2008
@@ -185,7 +185,7 @@ case $1 in
;;
*)
input=`echo $1 |sed 's/\\ / /'`
- if [ "$input" == "`basename "$input"`" ]; then
+ if [ "$input" = "`basename "$input"`" ]; then
input="`pwd`/$1"
fi
nev=`basename "$input" .avi`
@@ -222,14 +222,14 @@ while [ "$1"x != "x" ]; do
done
#checking for cd-recording device
-if [ "$burning" == 1 ]; then
+if [ "$burning" = 1 ]; then
echo -n "Searching for cdrecorder device... "
-if [ `uname -r |cut -d '.' -f 2` == 4 ]; then
+if [ `uname -r |cut -d '.' -f 2` = 4 ]; then
#linux 2.4.x
dev="dev=$dev4"
echo "$dev4"
-elif [ `uname -r |cut -d '.' -f 2` == 6 ]; then
+elif [ `uname -r |cut -d '.' -f 2` = 6 ]; then
#linux 2.6.x
if [ -e /dev/cdrecorder ]; then
dev='dev=/dev/cdrecorder'
@@ -262,7 +262,7 @@ exit 1
else #checking for version >= 2.01a14
echo -n "Checking for cdrecord version >= 2.01a14... "
$cdrbin cuefile=a 2>&1 |grep 'Bad Option' >/dev/null 2>&1
- if [ "$?" == 0 ]; then
+ if [ "$?" = 0 ]; then
cat <<EOF
ERROR: Can't find cdrecord version >= 2.01a14. You can download it at
ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01a20.tar.gz
@@ -281,7 +281,7 @@ else
subopts=''
fi
-if [ "x$subopts" == "x" ]; then
+if [ "x$subopts" = "x" ]; then
subs=''
else
subs='-sub '
@@ -310,7 +310,7 @@ else
fi
#finish displaying informations
-if [ "$burning" == 1 ]; then
+if [ "$burning" = 1 ]; then
#asking for cd
cat <<EOF
@@ -328,7 +328,7 @@ fi
mencoder -ofps 25 -oac lavc "$input" -ovc lavc -lavcopts vcodec=mpeg2video:vbitrate=$bitrate:acodec=mp2:abitrate=128:keyint=25:aspect=4/3:$paraopts -o "${nev}2.avi" -srate 44100 -of mpeg -channels 2 $vfopts $subs "$subopts"
videosize=`$ls -l "${nev}2.avi"|tr -s ' '|cut -d ' ' -f5`
-if ! [ `echo $(( $cdsize*1048576 < $videosize ))` == "1" ]; then
+if ! [ `echo $(( $cdsize*1048576 < $videosize ))` = "1" ]; then
#video is smaller, than $cdsize
mv ${nev}2.avi ${nev}00.mpg
else
@@ -348,7 +348,7 @@ do
#creating images
vcdimager -t svcd -c "$nev2.cue" -b "$nev2.bin" "$i"
#burning if needs
- if [ "$burning" == 1 ]; then
+ if [ "$burning" = 1 ]; then
if [ "$firstcd" != 1 ]; then
cat <<EOF
@@ -362,7 +362,7 @@ EOF
$cdrbin -v -dao $dev speed=12 gracetime=2 driveropts=burnfree -eject cuefile="$nev2.cue"
fi
#cleaning if needs
- if [ "$cleaning" == 1 ]; then
+ if [ "$cleaning" = 1 ]; then
rm -f "$nev2.cue" "$nev2.bin"
fi
done
Modified: trunk/TOOLS/encode2mpeglight
==============================================================================
--- trunk/TOOLS/encode2mpeglight (original)
+++ trunk/TOOLS/encode2mpeglight Mon Jul 7 08:43:45 2008
@@ -465,7 +465,7 @@ while (($#)) ; do
a=1
echo "$2" | grep -q '^[1-4]$' && a=$2
shift 2
- set -- " " -qmatrix kvcd -res $((3+(a+1)/2)) $([[ $a == [13] ]] && echo "-gop 24") "$@"
+ set -- " " -qmatrix kvcd -res $((3+(a+1)/2)) $([[ $a = [13] ]] && echo "-gop 24") "$@"
;;
-vcd) #
#-generate VCD compliant frames on output (default)
@@ -507,7 +507,7 @@ while (($#)) ; do
-vcodec) #<mpeg1|mpeg2|mpeg4>
#-force the selected video codec [VCD:mpeg1,SVCD-DVD:mpeg2,AVI:mpeg4]
isarg $1 "$2" Avi
- [[ $2 == mpeg[124] ]] && vcodec=$2 && [[ ${vcodec:4:1} == [12] ]] && vcodec=${vcodec}video
+ [[ $2 = mpeg[124] ]] && vcodec=$2 && [[ ${vcodec:4:1} = [12] ]] && vcodec=${vcodec}video
shift
;;
-qmatrix) #<kvcd|tmpgenc|default|hi-res>
@@ -855,10 +855,10 @@ done
#### output stream name check
[[ ! $output ]] && echo "**ERROR: [$PROGNAME] name of the output stream missing (-o name)" && exit 1
#### unspecified video norm
-[[ ! $videonorm && step -gt 1 && ! ( $mpeg && ${encode%,*} == ?:0:? && ! $menu ) && ${#TITLESET[*]} -eq 0 ]] && \
+[[ ! $videonorm && step -gt 1 && ! ( $mpeg && ${encode%,*} = ?:0:? && ! $menu ) && ${#TITLESET[*]} -eq 0 ]] && \
echo "**ERROR: [$PROGNAME] you must specify a video norm (-n n|p|s)" && exit 1
#### libfaac check
-if [[ ${encode%,*} == 8:?:? ]]; then
+if [[ ${encode%,*} = 8:?:? ]]; then
! mencoder -oac help 2>/dev/null | grep -q faac && echo "**ERROR: [$PROGNAME] missing libfaac support in mencoder [-encode 8:m:i]" && exit 1
fi
#### mpeg4
@@ -867,18 +867,18 @@ if [[ $vcodec = mpeg4 ]]; then
fi
#### pictsrc
if [[ $pictsrc ]]; then
- [[ $slideaudio != /dev/null && ${encode%,*} == 0:?:? && $mpeg ]] && \
+ [[ $slideaudio != /dev/null && ${encode%,*} = 0:?:? && $mpeg ]] && \
echo "**ERROR: [$PROGNAME] -encode 0:m:i is not compatible with mf:// in MPEG Mode" && exit 1
[[ $audioonly ]] && echo "**ERROR: [$PROGNAME] -audioonly does not work with mf://" && exit 1
fi
#### -encode 1:m:i is not allowed
-[[ ${encode%,*} == 1:?:? ]] && echo "**ERROR: [$PROGNAME] do not use -encode 1:m:i" && exit 1
+[[ ${encode%,*} = 1:?:? ]] && echo "**ERROR: [$PROGNAME] do not use -encode 1:m:i" && exit 1
###############################################################################
#### WARN if some options conflict is detected
###############################################################################
#### missing toolame support
-if [[ ${encode%,*} == 7:?:? ]]; then
+if [[ ${encode%,*} = 7:?:? ]]; then
if ! mencoder -oac help 2>/dev/null | grep -q t[wo]olame ; then
encode=4:${encode#?:}
do_log "++ WARN: [$PROGNAME] missing toolame support in mencoder, setting -encode $encode"
@@ -947,13 +947,13 @@ case $audioformat in
#### mplex fails with asr != 48000 for lpcm
lpcm) : ${asr:=48000} ${abr:=$((asr*16*${mpegchannels:-2}/1024))} ;;
esac
-if [[ ${encode%,*} == 0:?:? && ${!audioformat} = copy ]]; then
+if [[ ${encode%,*} = 0:?:? && ${!audioformat} = copy ]]; then
abr=0
if [[ ! $multiaudio ]]; then
get_abr
fi
fi
-[[ $mpeg && ${encode%,*} == ?:0:? ]] && \
+[[ $mpeg && ${encode%,*} = ?:0:? ]] && \
vbr=$(($(id_find ID_VIDEO_BITRATE "${MPLAYEROPT[@]}" ${dvddev:+-dvd-device "$dvddev"} "$@")/1000))
case $frameformat in
DVD) : ${asr:=48000} ;;
@@ -1032,7 +1032,7 @@ if [[ $pictsrc ]]; then
mplayer "$slideaudio" $SRATE -vo null -vc dummy -ao "${PCMWAV[@]}" $afm ${mpegchannels:+-channels $mpegchannels -af channels=$mpegchannels}
MPLAYEROPT=( "${MPLAYEROPT[@]}" -fps 1/$(id_find ID_LENGTH "$output".wav) -audiofile "$output".wav )
else
- if [[ $slideaudio == /dev/null ]]; then
+ if [[ $slideaudio = /dev/null ]]; then
MPLAYEROPT=( "${MPLAYEROPT[@]}" -fps $slidefps )
encode=0:${encode#?:}
else
@@ -1144,7 +1144,7 @@ if [[ $encode ]]; then
MUX="-mpegopts "
if [[ $telecine ]]; then
if [[ $vcodec = mpeg2video || ! $vcodec && $frameformat != VCD ]]; then
- if [[ $vfr == [12] ]]; then
+ if [[ $vfr = [12] ]]; then
[[ $videonorm = n ]] && MUX2=":telecine" || MUX2=":film2pal"
else
do_log "++ WARN: [$PROGNAME] telecine only works with 24000/1001 or 24 fps, disabling it"
@@ -1504,7 +1504,7 @@ is_film2pal () {
#### libtoolame asr/abr
#### libmp3lame asr
#### no check is done on the other channel in case of multiaudio
-if [[ $encode == [2-8]:?:? ]]; then
+if [[ $encode = [2-8]:?:? ]]; then
if [[ $srate ]]; then
r=$srate
else
@@ -1521,9 +1521,9 @@ if [[ $encode == [2-8]:?:? ]]; then
esac
fi
fi
- if [[ $encode == [4-7]:?:? ]]; then
+ if [[ $encode = [4-7]:?:? ]]; then
check_mencoder_abr "$r" ${AUDIOPASS##*=}
- elif [[ $encode == 8:?:? ]]; then
+ elif [[ $encode = 8:?:? ]]; then
case $r in
8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000) : ;;
*) echo "**ERROR: [$PROGNAME] libfaac does not support $r Hz sample rate" ; exit 1 ;;
@@ -1536,12 +1536,12 @@ if [[ $encode == [2-8]:?:? ]]; then
fi
fi
#### copy of non-MPEG audio in a VCD
-if [[ $step -gt 1 && $frameformat = VCD && $encode == 0:?:? && ( $mpeg || ${!audioformat} = copy ) && ! $testmca && ! $pictsrc ]]; then
+if [[ $step -gt 1 && $frameformat = VCD && $encode = 0:?:? && ( $mpeg || ${!audioformat} = copy ) && ! $testmca && ! $pictsrc ]]; then
a=$(id_find ID_AUDIO_CODEC "${MPLAYERINFO[@]}")
[[ $a != mp3 ]] && echo "**ERROR: [$PROGNAME] you cannot copy $a audio in a $frameformat" && exit 1
fi
#### mpegchannels > 2 only with ac3 and aac
-[[ $mpeg && ${mpegchannels:-2} -gt 2 && $encode == [2-57]:?:? ]] && CODEC=([2]=mp3 mp3 mp2 mp3 [7]=mp2) && \
+[[ $mpeg && ${mpegchannels:-2} -gt 2 && $encode = [2-57]:?:? ]] && CODEC=([2]=mp3 mp3 mp2 mp3 [7]=mp2) && \
echo "**ERROR: [$PROGNAME] audio codec ${CODEC[${encode%%:*}]} selected with -encode $encode do not support more than 2 audio channels" && exit 1
###############################################################################
#### set cleanup
@@ -1584,7 +1584,7 @@ if [[ $WARN ]]; then
fi
#### volume and audio copy
if [[ $volume ]]; then
- [[ $encode == 0:?:? && ( ${!audioformat} = copy || $step -eq 1 || $mpeg ) || ${!audioformat} = copy && ! $encode ]] && \
+ [[ $encode = 0:?:? && ( ${!audioformat} = copy || $step -eq 1 || $mpeg ) || ${!audioformat} = copy && ! $encode ]] && \
do_log "++ WARN: [$PROGNAME] you cannot modify the volume of the output audio stream if you are making a copy the input audio stream"
fi
#### cpu and bframes
@@ -1592,7 +1592,7 @@ if [[ $cpu && $bframes ]]; then
((bframes)) && do_log "++ WARN: [$PROGNAME] with bframes>0 the encoding will be faster with cpu=1"
fi
#### -usespeed
-if [[ $usespeed && ( $encode == 0:?:? || $encode == ?:0:? ) ]]; then
+if [[ $usespeed && ( $encode = 0:?:? || $encode = ?:0:? ) ]]; then
do_log "++ WARN: [$PROGNAME] -usespeed may not work if you do not encode both audio and video." && echo -n "Press return to proceed" && read
fi
#### total br
@@ -1651,7 +1651,7 @@ if [[ $pictsrc ]]; then
h_res=${v_res%x*}
v_res=${v_res#*x}
fi
-[[ $mpeg && ${encode%,*} == ?:0:? ]] && H_RES=$h_res && V_RES=$v_res
+[[ $mpeg && ${encode%,*} = ?:0:? ]] && H_RES=$h_res && V_RES=$v_res
###############################################################################
#### put the volume in DB
@@ -1666,7 +1666,7 @@ fi
###############################################################################
#### telecined (NTSC/PAL) MPEG copy/speed encoding change
###############################################################################
-if [[ $mpeg && ( $encode == ?:0:? || $usespeed ) || $usespeed && ! $encode && $step -gt 1 ]]; then
+if [[ $mpeg && ( $encode = ?:0:? || $usespeed ) || $usespeed && ! $encode && $step -gt 1 ]]; then
FPS=($(grep ID_VIDEO_FPS "$output".log | cut -f2 -d=) [1]=23.976 24.000 25.000 29.970 30.000 50.000 59.940 60.000)
for ((i=1;i<9;i++)); do
a=$(awk -v a=${FPS[0]} -v b=${FPS[i]} 'BEGIN{if (sqrt((a-b)*(a-b))<.02) print b}')
@@ -1726,7 +1726,7 @@ fi
if [[ $mpegfixaspect && $step -gt 1 ]]; then
a=$(get_aspect "${MPLAYERINFO[@]}")
[[ ${a:0:9} = undefined ]] && a=$(awk -v a=$h_res -v b=$v_res 'BEGIN{printf("%f",a/b)}')
- [[ $mpegaspect == 1 ]] && b=$(awk -v a=$H_RES -v b=$V_RES 'BEGIN{printf("%f",a/b)}') || b=${ASPECT[${mpegaspect:-2}]}
+ [[ $mpegaspect = 1 ]] && b=$(awk -v a=$H_RES -v b=$V_RES 'BEGIN{printf("%f",a/b)}') || b=${ASPECT[${mpegaspect:-2}]}
vfilter=$(awk -v a=$a -v A=$b -v W=$H_RES -v H=$V_RES -v crop=$mpegfixaspect -v i=${interlaced:-0} -v r=$rotate -v o=$overscan -v logfile="$(echo "$output" | sed 's/\\/\\\\/g')".log 'BEGIN{
ko=(1-o/100)
if(a==1.78||a==1.74)a=16/9
@@ -1817,7 +1817,7 @@ IDACOD=$(grep "ID_AUDIO_CODEC" "$output"
[[ $IDACOD = hwdts ]] && echo "**ERROR: [$PROGNAME] dts audio support missing in MPlayer" && \
echo "**ERROR: add dts support (libdts-0.0.2.tar.gz) or select a non dts stream" && \
echo "**ERROR: example: -aid 128 (ac3), -aid 160 (lpcm), -aid 0 (mpeg)" && exit 1
-[[ $mpeg && ! $pictsrc && ( $encode == 1:?:? || $multiaudio || $encode == 0:?:? && $IDACOD != mp3 && $IDACOD != a52 && $IDACOD != faad ) ]] && extra=1 || \
+[[ $mpeg && ! $pictsrc && ( $encode = 1:?:? || $multiaudio || $encode = 0:?:? && $IDACOD != mp3 && $IDACOD != a52 && $IDACOD != faad ) ]] && extra=1 || \
extra=
[[ $extra ]] && do_log "**ERROR: [$PROGNAME] output stream: unsupported audio codec $IDACOD" && exit 1
@@ -1857,7 +1857,7 @@ if [[ $encode ]]; then
PLOG=( -passlogfile "$output".avi2pass.log )
MSG=( -msglevel open=6:demuxer=6:demux=6 )
rm -f frameno.avi
- [[ $encode == 0:?:? && ! $extra ]] && F= || F=$af
+ [[ $encode = 0:?:? && ! $extra ]] && F= || F=$af
if [[ $usesbr && ! $extra ]]; then
((DEBUG)) && debug_line $((LINENO+2)) "usesbr "
me_bit_log
Modified: trunk/TOOLS/qepdvcd.sh
==============================================================================
--- trunk/TOOLS/qepdvcd.sh (original)
+++ trunk/TOOLS/qepdvcd.sh Mon Jul 7 08:43:45 2008
@@ -234,7 +234,7 @@ else
SUBTITLESTRING="$SUBFILENAME"
fi
-if [ $SPLIT == "0" ]; then
+if [ $SPLIT = "0" ]; then
CICLES=0
TIMESTRING=""
else
More information about the MPlayer-cvslog
mailing list