From 59c4f7fb0e2d0ca43ff2ea0dcb9671cc3fd69ba9 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Thu, 13 Mar 2014 22:32:14 +0100
Subject: update encode scripts for renamed fdk-aac-dabplus encoders

---
 encode-alsasrc-gst-dabplus.sh |  4 ++--
 encode-alsasrc-sox-mpeg.sh    |  6 ++++--
 encode-alsasrc-sox.sh         | 19 -------------------
 encode-fbplus.sh              | 12 +++++++-----
 encode-url-gst-dabplus.sh     |  4 ++--
 5 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100755 encode-alsasrc-sox.sh

diff --git a/encode-alsasrc-gst-dabplus.sh b/encode-alsasrc-gst-dabplus.sh
index 6945fa8..9affc5a 100755
--- a/encode-alsasrc-gst-dabplus.sh
+++ b/encode-alsasrc-gst-dabplus.sh
@@ -23,7 +23,7 @@ then
         audio/x-raw, 'rate=48000,format=S16LE,channels=2' ! \
         queue "max-size-time=$QUEUEDELAY" ! \
         filesink location="/dev/stdout" | \
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq \
+        dabplus-enc-file-zmq \
             -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}"
 
 elif [ "$GSTREAMER_VERSION" == "0" ]
@@ -33,7 +33,7 @@ then
         audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \
         queue "max-size-time=$QUEUEDELAY" ! \
         filesink location="/dev/stdout" | \
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq \
+        dabplus-enc-file-zmq \
             -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}"
 fi
 
diff --git a/encode-alsasrc-sox-mpeg.sh b/encode-alsasrc-sox-mpeg.sh
index 3942ac1..3de71b5 100755
--- a/encode-alsasrc-sox-mpeg.sh
+++ b/encode-alsasrc-sox-mpeg.sh
@@ -3,6 +3,9 @@
 # Read audio from ALSA input using sox, and encode with toolame,
 # send to ZMQ
 #
+# This needs toolame-dab from
+# https://github.com/Opendigitalradio/toolame-dab
+#
 BITRATE=$1
 DST=$2
 ALSASRC="default"
@@ -15,6 +18,5 @@ then
 fi
 
 sox -t alsa $ALSASRC -b 16 -t raw - rate 48k channels 2 | \
-    ../toolame/toolame \
-    -s 48 -D 4 -b $BITRATE /dev/stdin $DST
+    toolame -s 48 -D 4 -b $BITRATE /dev/stdin $DST
 
diff --git a/encode-alsasrc-sox.sh b/encode-alsasrc-sox.sh
deleted file mode 100755
index 5ec8db7..0000000
--- a/encode-alsasrc-sox.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# Read audio from ALSA input using sox, and encode with fdk-aac-dabplus-zmq
-#
-BITRATE=$1
-DST=$2
-ALSASRC="default"
-
-if [ "$DST" == "" ]
-then
-    echo "Usage:"
-    echo " $0 <bitrate> <zmq destination>"
-    exit 1
-fi
-
-sox -t alsa $ALSASRC -b 16 -t raw - rate 48k channels 2 | \
-    ../fdk-aac-dabplus/aac-enc-dabplus-zmq \
-    -i /dev/stdin -b $BITRATE -f raw -a -o $DST
-
diff --git a/encode-fbplus.sh b/encode-fbplus.sh
index 75448ea..cc0d32e 100755
--- a/encode-fbplus.sh
+++ b/encode-fbplus.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 #
-# Encode Frequence Banane to ZMQ tcp://*:2720
+# Encode Frequence Banane to ZMQ
 #
+# Remarks: it's probably better to use the
+# snd-aloop scenario now.
 
 WITH_GSTREAMER=0
 URL=http://fbpc5.epfl.ch:8000/fb_192
@@ -24,11 +26,11 @@ then
         audioconvert ! \
         audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \
         filesink location="/dev/stdout" | \
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq -i /dev/stdin \
-            -b $BITRATE -f raw -a -o $DSTPORT
+        dabplus-enc-file-zmq \
+            -i /dev/stdin -b $BITRATE -f raw -a -o $DSTPORT
 else
     mpg123 -s $URL |\
         sox -t raw -r 44100 -e signed -b 16 -c 2 -   -t raw  - rate 32k |\
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq -i /dev/stdin \
-            -r 32000 -b $BITRATE -f raw -a -o $DSTPORT
+        dabplus-enc-file-zmq \
+            -i /dev/stdin -r 32000 -b $BITRATE -f raw -a -o $DSTPORT
 fi
diff --git a/encode-url-gst-dabplus.sh b/encode-url-gst-dabplus.sh
index da16851..86f822b 100755
--- a/encode-url-gst-dabplus.sh
+++ b/encode-url-gst-dabplus.sh
@@ -26,7 +26,7 @@ then
         audioconvert ! \
         audio/x-raw, 'rate=48000,format=S16LE,channels=2' ! \
         filesink location="/dev/stdout" | \
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq \
+        dabplus-enc-file-zmq \
             -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}"
 
 elif [ "$GSTREAMER_VERSION" == "0" ]
@@ -38,7 +38,7 @@ then
         audioconvert ! \
         audio/x-raw-int, 'rate=48000,format=S16LE,channels=2' ! \
         filesink location="/dev/stdout" | \
-        ../fdk-aac-dabplus/aac-enc-dabplus-zmq \
+        dabplus-enc-file-zmq \
             -i /dev/stdin -b $BITRATE -f raw -a -o "${DSTPORT}"
 fi
 
-- 
cgit v1.2.3