|
Lines 514-520
Link Here
|
| 514 |
TRANSCODE_PID="$!" |
514 |
TRANSCODE_PID="$!" |
| 515 |
# Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 |
515 |
# Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 |
| 516 |
sleep 15s |
516 |
sleep 15s |
| 517 |
if [ ! -z "`ps aux | grep " $TRANSCODE_PID "`" ]; then |
517 |
if [ ! -z "`ps aux | grep " $TRANSCODE_PID " | grep -v grep`" ]; then |
| 518 |
kill -9 "$TRANSCODE_PID" &> /dev/null |
518 |
kill -9 "$TRANSCODE_PID" &> /dev/null |
| 519 |
fi |
519 |
fi |
| 520 |
PROGRESSIVE=`grep progressive "$WORKDIR"/fieldanalyse.dat | wc -l` |
520 |
PROGRESSIVE=`grep progressive "$WORKDIR"/fieldanalyse.dat | wc -l` |
|
Lines 2087-2093
Link Here
|
| 2087 |
if [ ! -z "$RESAMPLE_ARGS" ]; then |
2087 |
if [ ! -z "$RESAMPLE_ARGS" ]; then |
| 2088 |
echo -en "\n\e[33;01m Checking if Transcode can decode audio stream ...\e[m" |
2088 |
echo -en "\n\e[33;01m Checking if Transcode can decode audio stream ...\e[m" |
| 2089 |
eval transcode $PROBE_ARGS -i \"$file\" $IMPORT_ARGS $EXPORT_ARGS $ASPECT_ARGS $TRANSCODE_CROP_ARGS $FILTER_ARGS $AUDIO_ARGS -c 0-200 -o \""$WORKDIR"/"$test_outfile"\" -w $VID_BITRATE &> /dev/null |
2089 |
eval transcode $PROBE_ARGS -i \"$file\" $IMPORT_ARGS $EXPORT_ARGS $ASPECT_ARGS $TRANSCODE_CROP_ARGS $FILTER_ARGS $AUDIO_ARGS -c 0-200 -o \""$WORKDIR"/"$test_outfile"\" -w $VID_BITRATE &> /dev/null |
| 2090 |
sleep 15s && [ ! -z "`ps aux | grep " $TRANSCODE_PID "`" ] && kill -9 "$TRANSCODE_PID" &> /dev/null # Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 seconds |
2090 |
sleep 15s && [ ! -z "`ps aux | grep " $TRANSCODE_PID " | grep -v grep`" ] && kill -9 "$TRANSCODE_PID" &> /dev/null # Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 seconds |
| 2091 |
if [ ! -s "$WORKDIR"/transcode_test.m2v ]; then |
2091 |
if [ ! -s "$WORKDIR"/transcode_test.m2v ]; then |
| 2092 |
RESAMPLE_ARGS= |
2092 |
RESAMPLE_ARGS= |
| 2093 |
TRANSCODE_BAD_AUDIO="yes" |
2093 |
TRANSCODE_BAD_AUDIO="yes" |
|
Lines 2108-2114
Link Here
|
| 2108 |
echo -en "\e[33;01m Checking if Transcode can decode video stream without MPlayer ...\e[m" |
2108 |
echo -en "\e[33;01m Checking if Transcode can decode video stream without MPlayer ...\e[m" |
| 2109 |
eval transcode -i \"$file\" $EXPORT_ARGS $ASPECT_ARGS $TRANSCODE_CROP_ARGS $FILTER_ARGS $AUDIO_ARGS -c 0-0:0:5 &> "$WORKDIR"/transcode_test & |
2109 |
eval transcode -i \"$file\" $EXPORT_ARGS $ASPECT_ARGS $TRANSCODE_CROP_ARGS $FILTER_ARGS $AUDIO_ARGS -c 0-0:0:5 &> "$WORKDIR"/transcode_test & |
| 2110 |
TRANSCODE_PID="$!" |
2110 |
TRANSCODE_PID="$!" |
| 2111 |
sleep 15s && [ ! -z "`ps aux | grep " $TRANSCODE_PID "`" ] && kill -9 "$TRANSCODE_PID" &> /dev/null # Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 seconds |
2111 |
sleep 15s && [ ! -z "`ps aux | grep " $TRANSCODE_PID " | grep -v grep`" ] && kill -9 "$TRANSCODE_PID" &> /dev/null # Transcode sometimes has problems exiting cleanly with '-c', hard kill it manually if it hasn't exited after 15 seconds |
| 2112 |
if [ ! -z "`grep -E \"V=(null)|A=(null)|/dev/zero|(module=null)\" "$WORKDIR"/transcode_test`" ]; then |
2112 |
if [ ! -z "`grep -E \"V=(null)|A=(null)|/dev/zero|(module=null)\" "$WORKDIR"/transcode_test`" ]; then |
| 2113 |
TRANSCODE_BAD_DECODE="yes" # Check to see if Transcode can decode by itself |
2113 |
TRANSCODE_BAD_DECODE="yes" # Check to see if Transcode can decode by itself |
| 2114 |
echo -e "\e[33;01m NO\e[m\n" |
2114 |
echo -e "\e[33;01m NO\e[m\n" |
|
Lines 2156-2168
Link Here
|
| 2156 |
# Tested against 1.1.0 CVS |
2156 |
# Tested against 1.1.0 CVS |
| 2157 |
tail -fn1 "$WORKDIR"/tmp.log & |
2157 |
tail -fn1 "$WORKDIR"/tmp.log & |
| 2158 |
TAIL_PID="$!" |
2158 |
TAIL_PID="$!" |
| 2159 |
while [ ! -z "`ps aux | grep " $TRANSCODE_PID "`" ]; do |
2159 |
while [ ! -z "`ps aux | grep " $TRANSCODE_PID " | grep -v grep`" ]; do |
| 2160 |
sleep 1s |
2160 |
sleep 1s |
| 2161 |
done |
2161 |
done |
| 2162 |
kill "$TAIL_PID" &> /dev/null |
2162 |
kill "$TAIL_PID" &> /dev/null |
| 2163 |
echo |
2163 |
echo |
| 2164 |
else |
2164 |
else |
| 2165 |
while [ ! -z "`ps aux | grep " $TRANSCODE_PID "`" ]; do |
2165 |
while [ ! -z "`ps aux | grep " $TRANSCODE_PID " | grep -v grep`" ]; do |
| 2166 |
TRANSCODE_PROC=`tail -n1 "$WORKDIR"/tmp.log` |
2166 |
TRANSCODE_PROC=`tail -n1 "$WORKDIR"/tmp.log` |
| 2167 |
if [ ! -z "$TRANSCODE_PROC" ]; then |
2167 |
if [ ! -z "$TRANSCODE_PROC" ]; then |
| 2168 |
if [ "$TERM" = "xterm" ]; then # Non xterm's scroll up one line when issuing backspaces after reaching the leftmost limit |
2168 |
if [ "$TERM" = "xterm" ]; then # Non xterm's scroll up one line when issuing backspaces after reaching the leftmost limit |
