aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcompare.sh6
-rw-r--r--cosin.mux (renamed from test.config)0
-rwxr-xr-xencode-fbplus.sh4
-rwxr-xr-xencode-url-gst-dabplus.sh36
-rwxr-xr-xzmq-rx-raweti.py (renamed from zmq-rx.py)0
-rw-r--r--zmq-simul.mux4
6 files changed, 31 insertions, 19 deletions
diff --git a/compare.sh b/compare.sh
deleted file mode 100755
index 82e8fd2..0000000
--- a/compare.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-rm original.eti compare.eti
-
-./mux-throttled-nofb.sh -n 10 > original.eti
-../crc-dabmux-0.3.0.4/src/CRC-DabMux-cfg examplemux.config > compare.eti
-
-dhex original.eti compare.eti
diff --git a/test.config b/cosin.mux
index 20859ed..20859ed 100644
--- a/test.config
+++ b/cosin.mux
diff --git a/encode-fbplus.sh b/encode-fbplus.sh
index f864a0a..e8cfaf8 100755
--- a/encode-fbplus.sh
+++ b/encode-fbplus.sh
@@ -9,12 +9,12 @@ BITRATE=64
if [ "$WITH_GSTREAMER" == "1" ]
then
- gst-launch-1.0 -q \
+ gst-launch-0.10 -q \
uridecodebin uri=$URL ! \
queue ! \
audioresample quality=8 ! \
audioconvert ! \
- audio/x-raw, 'rate=48000,format=S16LE,channels=2' ! \
+ 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 'tcp://*:2720'
else
diff --git a/encode-url-gst-dabplus.sh b/encode-url-gst-dabplus.sh
index d1e2ce7..bbe3d59 100755
--- a/encode-url-gst-dabplus.sh
+++ b/encode-url-gst-dabplus.sh
@@ -7,6 +7,8 @@ BITRATE=$2
DSTPORT=$3
QUEUEDELAY=400000 #400ms
+GSTREAMER_VERSION="1"
+
if [ "$DSTPORT" == "" ]
then
echo "Usage:"
@@ -15,12 +17,28 @@ then
fi
-gst-launch-1.0 -q \
- uridecodebin uri=$URL ! \
- queue "max-size-time=$QUEUEDELAY" ! \
- audioresample quality=8 ! \
- audioconvert ! \
- audio/x-raw, '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 "tcp://*:${DSTPORT}"
+if [ "$GSTREAMER_VERSION" == "1" ]
+then
+ gst-launch-1.0 -q \
+ uridecodebin uri=$URL ! \
+ queue "max-size-time=$QUEUEDELAY" ! \
+ audioresample quality=8 ! \
+ audioconvert ! \
+ audio/x-raw, '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 "tcp://*:${DSTPORT}"
+
+elif [ "$GSTREAMER_VERSION" == "0" ]
+then
+ gst-launch -q \
+ uridecodebin uri=$URL ! \
+ queue "max-size-time=$QUEUEDELAY" ! \
+ audioresample quality=8 ! \
+ 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 "tcp://*:${DSTPORT}"
+fi
+
diff --git a/zmq-rx.py b/zmq-rx-raweti.py
index 6363299..6363299 100755
--- a/zmq-rx.py
+++ b/zmq-rx-raweti.py
diff --git a/zmq-simul.mux b/zmq-simul.mux
index 8352666..a08f5c7 100644
--- a/zmq-simul.mux
+++ b/zmq-simul.mux
@@ -42,10 +42,10 @@ services {
subchannels {
sub_fb {
type dabplus
- ;use ZeroMQ:
+ ; use ZeroMQ:
inputfile "tcp://localhost:2720"
nonblock false
- bitrate 96
+ bitrate 64
id 24
protection 3
}