diff options
| -rwxr-xr-x | encode-alsa32.sh | 3 | ||||
| -rwxr-xr-x | encode-alsasrc-gst-dabplus.sh | 12 | ||||
| -rwxr-xr-x | encode-fbplus.sh | 12 | ||||
| -rwxr-xr-x | encode-url-gst-dabplus.sh | 14 |
4 files changed, 21 insertions, 20 deletions
diff --git a/encode-alsa32.sh b/encode-alsa32.sh index 248dc9e..750ecc5 100755 --- a/encode-alsa32.sh +++ b/encode-alsa32.sh @@ -13,4 +13,5 @@ then exit 1 fi -dabplus-enc-alsa-zmq -d $ALSASRC -c 2 -r 32000 -b $BITRATE -o $DST -p 48 +dabplus-enc -d $ALSASRC -c 2 -r 32000 -b $BITRATE -o $DST -p 48 + diff --git a/encode-alsasrc-gst-dabplus.sh b/encode-alsasrc-gst-dabplus.sh index 9affc5a..7ec5d9e 100755 --- a/encode-alsasrc-gst-dabplus.sh +++ b/encode-alsasrc-gst-dabplus.sh @@ -3,12 +3,12 @@ # Read audio from ALSA input using gstreamer, and encode with fdk-aac-dabplus-zmq # BITRATE=$1 -DSTPORT=$2 +DST=$2 QUEUEDELAY=400000 #400ms GSTREAMER_VERSION="0" -if [ "$DSTPORT" == "" ] +if [ "$DST" == "" ] then echo "Usage:" echo " $0 <bitrate> <zmq destination>" @@ -23,8 +23,8 @@ then audio/x-raw, 'rate=48000,format=S16LE,channels=2' ! \ queue "max-size-time=$QUEUEDELAY" ! \ filesink location="/dev/stdout" | \ - dabplus-enc-file-zmq \ - -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}" + dabplus-enc \ + -i /dev/stdin -b $BITRATE -f raw -a -o "${DST}" elif [ "$GSTREAMER_VERSION" == "0" ] then @@ -33,7 +33,7 @@ then audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \ queue "max-size-time=$QUEUEDELAY" ! \ filesink location="/dev/stdout" | \ - dabplus-enc-file-zmq \ - -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}" + dabplus-enc \ + -i /dev/stdin -b $BITRATE -f raw -a -o "${DST}" fi diff --git a/encode-fbplus.sh b/encode-fbplus.sh index cc0d32e..1e1bfc8 100755 --- a/encode-fbplus.sh +++ b/encode-fbplus.sh @@ -8,9 +8,9 @@ WITH_GSTREAMER=0 URL=http://fbpc5.epfl.ch:8000/fb_192 BITRATE=$1 -DSTPORT=$2 +DST=$2 -if [ "$DSTPORT" == "" ] +if [ "$DST" == "" ] then echo "Usage:" echo " $0 <bitrate> <zmq destination>" @@ -26,11 +26,11 @@ then audioconvert ! \ audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \ filesink location="/dev/stdout" | \ - dabplus-enc-file-zmq \ - -i /dev/stdin -b $BITRATE -f raw -a -o $DSTPORT + dabplus-enc \ + -i /dev/stdin -b $BITRATE -f raw -a -o $DST else mpg123 -s $URL |\ sox -t raw -r 44100 -e signed -b 16 -c 2 - -t raw - rate 32k |\ - dabplus-enc-file-zmq \ - -i /dev/stdin -r 32000 -b $BITRATE -f raw -a -o $DSTPORT + dabplus-enc \ + -i /dev/stdin -r 32000 -b $BITRATE -f raw -a -o $DST fi diff --git a/encode-url-gst-dabplus.sh b/encode-url-gst-dabplus.sh index 86f822b..b05d7bb 100755 --- a/encode-url-gst-dabplus.sh +++ b/encode-url-gst-dabplus.sh @@ -1,15 +1,15 @@ #!/bin/bash # -# Read a URL using gstreamer, and encode with fdk-aac-dabplus-zmq +# Read a URL using gstreamer, and encode with fdk-aac-dabplus-enc # URL=$1 BITRATE=$2 -DSTPORT=$3 +DST=$3 QUEUEDELAY=400000 #400ms GSTREAMER_VERSION="1" -if [ "$DSTPORT" == "" ] +if [ "$DST" == "" ] then echo "Usage:" echo " $0 <url> <bitrate> <zmq destination>" @@ -26,8 +26,8 @@ then audioconvert ! \ audio/x-raw, 'rate=48000,format=S16LE,channels=2' ! \ filesink location="/dev/stdout" | \ - dabplus-enc-file-zmq \ - -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}" + dabplus-enc \ + -i /dev/stdin -b $BITRATE -f raw -a -o "${DST}" elif [ "$GSTREAMER_VERSION" == "0" ] then @@ -38,7 +38,7 @@ then audioconvert ! \ audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \ filesink location="/dev/stdout" | \ - dabplus-enc-file-zmq \ - -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}" + dabplus-enc \ + -i /dev/stdin -b $BITRATE -f raw -a -o "${DST}" fi |