summaryrefslogtreecommitdiff
path: root/istream.sh
diff options
context:
space:
mode:
authorAlib <aliboba@free.fr>2010-02-22 11:43:27 +0100
committerAlib <aliboba@free.fr>2010-02-22 11:43:27 +0100
commit3afb9d31e43ffd6e37dd988247b0e94422855f87 (patch)
tree9dfbd7b439c0181db1e5cef8d9de39237763ecc0 /istream.sh
parentd7a0b351167c289cbd3918a912235ff839230960 (diff)
downloadistreamdev-3afb9d31e43ffd6e37dd988247b0e94422855f87.tar.gz
istreamdev-3afb9d31e43ffd6e37dd988247b0e94422855f87.tar.bz2
- fixed img position for thumbs
- added segmenter binary to be configurable
Diffstat (limited to 'istream.sh')
-rwxr-xr-xistream.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/istream.sh b/istream.sh
index 224bb11..ceabf37 100755
--- a/istream.sh
+++ b/istream.sh
@@ -10,6 +10,7 @@ HTTP_PATH="$6ram/"
SEGDUR=10 # Length of Segments produced (between 10 and 30)
SEGWIN=$7 # Amount of Segments to produce
FFPATH=$8
+SEGMENTERPATH=$9
PREFIX=stream
@@ -25,9 +26,7 @@ fi
# sending it to the segmenter via a PIPE
##############################################################
-res=`ps ax|grep "segmenter" | grep -v grep`
-
-if test -z "$res"
+if (! ps ax | awk '{print $5}' | grep -q "$SEGMENTERPATH")
then
cd ram
@@ -37,6 +36,6 @@ cd ram
-cmp \+chroma -partitions +parti4x4+partp8x8+partb8x8 -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25 \
-sc_threshold 40 -i_qfactor 0.71 -bt $VRATE -maxrate $VRATE -bufsize $VRATE -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6 \
-qmin 10 -qmax 51 -qdiff 4 -level 30 -g 30 -async 2 -threads 4 - | \
-segmenter - $SEGDUR $PREFIX $PREFIX.m3u8 $HTTP_PATH $SEGWIN &
+$SEGMENTERPATH - $SEGDUR $PREFIX $PREFIX.m3u8 $HTTP_PATH $SEGWIN &
fi