add gstreamer based JACK to icecast MP3 lame encoder,

add YAML deefuzzer audio conf file

diff --git a/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml b/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml
new file mode 100644 (file)
index 0000000..56ba762
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml
@@ -0,0 +1,62 @@
+<deefuzzer>
+    <log>/var/log/telecaster/telecaster_audio_monitor.log</log>
+    <m3u>/var/www/m3u/telecaster_audio_monitor.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1236</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <mode>1</mode>
+            <author>Inconnu</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>mp3</format>
+            <voices>2</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>96</bitrate>
+            <dir>/home/telecaster/media/mp3</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <type>icecast</type>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+            <mountpoint>telecaster_mp3_monitor</mountpoint>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/mp3</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>telecaster_mp3_monitor</name>
+            <description>TeleCaster MP3 monitor</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+

diff --git a/tcserver/conf/etc/telecaster/telecaster_audio_monitor.yaml b/tcserver/conf/etc/telecaster/telecaster_audio_monitor.yaml
new file mode 100644 (file)
index 0000000..0e45d94
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/telecaster_audio_monitor.yaml
@@ -0,0 +1,25 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_audio_monitor.log
+  m3u: /var/www/m3u/telecaster_audio_monitor.m3u
+  station:
+    control: {mode: 0, port: 1236}
+    infos: {description: TeleCaster MP3 monitor,
+            genre: Vocal,
+            name: telecaster_mp3_monitor,
+            url: 'http://parisson.com.com'}
+    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
+    media: {bitrate: 96,
+            dir: /home/telecaster/media/mp3,
+            format: mp3, ogg_quality: 4,
+            samplerate: 48000, shuffle: 0, voices: '2'}
+    record: {dir: /home/telecaster/trash/mp3, mode: 1}
+    relay: {author: Inconnu, mode: 1,
+            url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
+    rss: {dir: /var/www/rss, enclosure: 0,
+          media_url: 'http://my.domain.com/rss/'}
+    server: {host: 127.0.0.1, mountpoint: telecaster_mp3_monitor,
+             port: 8000, public: 0,
+             sourcepassword: source2parisson, type: icecast}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
+              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+              tags: bla bla}

diff --git a/tcserver/conf/home/fluxbox/tc_audio_start.sh b/tcserver/conf/home/fluxbox/tc_audio_start.sh
index b1fde2848be8effd40f98aef8d45046d80583ca1..08ab71b2285677c17d4f04ce9ab5573489fae496 100755 (executable)
--- a/tcserver/conf/home/fluxbox/tc_audio_start.sh
+++ b/tcserver/conf/home/fluxbox/tc_audio_start.sh
@@ -15,20 +15,21 @@ fi
 
 qjackctl &
 
-edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
+telecaster/tc_audio_mp3.sh &
+#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null &
 
 sleep 3
 
 # MONO setup
-jack_disconnect jack_rack:out_2 LIVE:in_2
-jack_connect jack_rack:out_1  LIVE:in_1
-jack_connect jack_rack:out_1  LIVE:in_2
+jack_disconnect jack_rack:out_2 lamemp3enc:in_2
+jack_connect    jack_rack:out_1 lamemp3enc:in_1
+jack_connect    jack_rack:out_1 lamemp3enc:in_2
 #jack_connect jack_rack:out_1  system:playback_1
 #jack_connect jack_rack:out_1  system:playback_2
 
 # STEREO setup
-#jack_connect jack_rack:out_1  LIVE:in_1
-#jack_connect jack_rack:out_2  LIVE:in_2
+#jack_connect jack_rack:out_1  lamemp3enc:in_1
+#jack_connect jack_rack:out_2  lamemp3enc:in_2
 #jack_connect jack_rack:out_1  system:playback_1
 #jack_connect jack_rack:out_2  system:playback_2
 

diff --git a/tcserver/conf/home/fluxbox/tc_video_start.sh b/tcserver/conf/home/fluxbox/tc_video_start.sh
index 07783ee32b79dd344cb9d435f5e0d9b32b7c2399..bdac632d95f4eb35300c81ab381428878a3e6447 100755 (executable)
--- a/tcserver/conf/home/fluxbox/tc_video_start.sh
+++ b/tcserver/conf/home/fluxbox/tc_video_start.sh
@@ -2,11 +2,11 @@
 
 # Start TeleCaster video channel
 
-/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh > /dev/null &
+telecaster/tc_video_simple_webm_stream.sh > /dev/null &
 
 sleep 3
 
-jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
-jack_connect    jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+jack_disconnect system:capture_1 webmenc:in_jackaudiosrc0_1
+jack_connect    jack_rack:out_1  webmenc:in_jackaudiosrc0_1
 
-deefuzzer /etc/telecaster/deefuzzer_video_safe.xml > /dev/null & 
+deefuzzer /etc/telecaster/deefuzzer_video_safe.xml > /dev/null &

diff --git a/tcserver/conf/home/fluxbox/telecaster/gst_osc_multi.py b/tcserver/conf/home/fluxbox/telecaster/gst_osc_multi.py
index c551661b5496dea4446667597a815e3b121a8024..d47e17f6b9d6888174582808025323231048aa2c 100644 (file)
--- a/tcserver/conf/home/fluxbox/telecaster/gst_osc_multi.py
+++ b/tcserver/conf/home/fluxbox/telecaster/gst_osc_multi.py
@@ -75,13 +75,10 @@ class GSTWebmStreamer(object):
                     ! queue ! tcpserversink host=%s port=%s protocol=none blocksize=%s sync-method=1
                     """ % (self.host, str(self.port), str(self.blocksize))
 
-
-
     def video_setup(self, threads=4, quality=10):
         self.video = """! queue ! ffmpegcolorspace ! queue ! vp8enc speed=2 threads=%s quality=%s \
                         max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true  \
-                        ! queue ! muxer.
-                        """ % (str(threads), str(quality))
+                        ! queue ! muxer.""" % (str(threads), str(quality))
 
     def audio_setup(self, quality=0.3):
         self.audio = "! queue ! audioconvert ! queue ! vorbisenc quality=%s ! queue ! muxer." % str(self.quality)

diff --git a/tcserver/conf/home/fluxbox/telecaster/tc_audio_mp3.sh b/tcserver/conf/home/fluxbox/telecaster/tc_audio_mp3.sh
new file mode 100755 (executable)
index 0000000..0d45ed1
--- /dev/null
+++ b/tcserver/conf/home/fluxbox/telecaster/tc_audio_mp3.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+gst-launch jackaudiosrc connect=1 client-name=lamemp3enc ! audio/x-raw-float, channels=1 \
+       ! queue ! audioconvert ! queue ! lamemp3enc quality=4.0 \
+       ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live.mp3
+       > /dev/null

diff --git a/tcserver/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh b/tcserver/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
index b5d270445a20757bb8cf4572b03ada55a7f2bfad..5753f72595dcdf9b63e63073c7b5e63cd11286b6 100755 (executable)
--- a/tcserver/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
+++ b/tcserver/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
@@ -7,14 +7,14 @@ HEIGHT=360
 #WIDTH=1280
 #HEIGHT=720
 
-v4l2-ctl -d 1 -c power_line_frequency=1 
+v4l2-ctl -d 1 -c power_line_frequency=1
 
 gst-launch v4l2src device=/dev/video1 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT, framerate={24/1}  \
        ! queue ! ffmpegcolorspace \
        ! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true  ! queue ! muxout. \
-       jackaudiosrc connect=2 ! audio/x-raw-float, channels=2 \
+       jackaudiosrc connect=2 client-name=webmenc ! audio/x-raw-float, channels=2 \
        ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
        webmmux streamable=true name=muxout \
        ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \
-       > /dev/null 
+       > /dev/null