add videos ffmpeg scripts, prepare OGG by default

diff --git a/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
deleted file mode 100644 (file)
index 1638c6e..0000000
--- a/conf/etc/telecaster/edcast_jack_local.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.mp3
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://parisson.com
-ServerName=TeleCaster LIVE
-ServerDescription=Local LIVE media streaming broadcast
-ServerGenre=Vocal
-AutomaticReconnectSecs=10
-AutoConnect=1
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=MP3
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-NumberChannels=1
-Samplerate=44100
-BitrateNominal=64
-BitrateMin=32
-BitrateMax=96
-
-#
-SaveDirectoryFlag=0
-SaveDirectory=/home/telecaster/trash
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=3
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/telecaster_streamer_log
-

diff --git a/conf/etc/telecaster/edcast_jack_local_mp3.cfg b/conf/etc/telecaster/edcast_jack_local_mp3.cfg
new file mode 100644 (file)
index 0000000..1638c6e
--- /dev/null
+++ b/conf/etc/telecaster/edcast_jack_local_mp3.cfg
@@ -0,0 +1,53 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/telecaster_live.mp3
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+ServerStreamURL=http://parisson.com
+ServerName=TeleCaster LIVE
+ServerDescription=Local LIVE media streaming broadcast
+ServerGenre=Vocal
+AutomaticReconnectSecs=10
+AutoConnect=1
+# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
+Encode=MP3
+# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
+NumberChannels=1
+Samplerate=44100
+BitrateNominal=64
+BitrateMin=32
+BitrateMax=96
+
+#
+SaveDirectoryFlag=0
+SaveDirectory=/home/telecaster/trash
+SaveAsWAV=0
+#
+# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
+OggQuality=3
+OggBitrateQualityFlag=Quality
+# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
+LameCBRFlag=0
+LameQuality=5
+LameCopywrite=0
+LameOriginal=0
+LameStrictISO=0
+LameDisableReservior=0
+LameVBRMode=vbr_abr
+LameLowpassfreq=0
+LameHighpassfreq=0
+LAMEPreset=0
+# AAC (FAAC) specific settings.
+AACQuality=100
+AACCutoff=
+# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
+LogLevel=1
+# Log File
+LogFile=/tmp/telecaster_streamer_log
+

diff --git a/conf/etc/telecaster/telecaster_mp3.xml b/conf/etc/telecaster/telecaster_mp3.xml
new file mode 100644 (file)
index 0000000..1d0eeaf
--- /dev/null
+++ b/conf/etc/telecaster/telecaster_mp3.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster Services</description>
+        <url>telecaster.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>96</bitrate>
+        <channels>1</channels>
+        <ogg_quality>3</ogg_quality>
+        <samplerate>44100</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Droit civil - Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>

diff --git a/conf/etc/telecaster/telecaster_ogg.xml b/conf/etc/telecaster/telecaster_ogg.xml
new file mode 100644 (file)
index 0000000..1d0eeaf
--- /dev/null
+++ b/conf/etc/telecaster/telecaster_ogg.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster Services</description>
+        <url>telecaster.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>96</bitrate>
+        <channels>1</channels>
+        <ogg_quality>3</ogg_quality>
+        <samplerate>44100</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Droit civil - Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>

diff --git a/telecaster.py b/telecaster.py
index a95ea8254f33828a3a0fcdd0965e66055c44f91e..655097b8c827099d6a8fff3ed0838196bafb7642 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -91,15 +91,24 @@ class TeleCaster:
 
         if deefuzzer_pid == [] and form.has_key("action") and \
             form.has_key("department") and form.has_key("conference") and \
-            form.has_key("professor") and form.has_key("comment") and \
-            form["action"].value == "start":
-
+            form.has_key("session") and form["action"].value == "start":
+
+           if not form.has_key("professsor"):
+               professor = 'Inconnu'
+           else:
+               professor = form.getfirst("professor")
+               
+           if not form.has_key("comment"):
+               comment = 'Non'
+           else:
+               form.getfirst("comment")
+               
             self.conference_dict = {'title': self.title,
                         'department': form.getfirst("department"),
                         'conference': form.getfirst("conference"),
                         'session': form.getfirst("session"),
-                        'professor': form.getfirst("professor"),
-                        'comment': form.getfirst("comment")}
+                        'professor': professor,
+                        'comment': comment}
 
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
             s.start()

diff --git a/tools/ffmpeg_dv_jack_fifo_fw b/tools/ffmpeg_dv_jack_fifo_fw
new file mode 100755 (executable)
index 0000000..07075a1
--- /dev/null
+++ b/tools/ffmpeg_dv_jack_fifo_fw
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+ start)
+   fifo=/tmp/video_fifo
+   if [ ! -e $fifo ]; then
+   mkfifo $fifo
+   fi
+
+   dir=/mnt/data1/video_tests
+   now=`date -R`
+
+   dvgrab -buffers 1 - | ffmpeg -f dv -i - -f jack -i ffmpeg -vcodec libtheora -s 480x320 -aspect 16:9 -acodec libvorbis -b 300k -f ogg -y $fifo -map 0.0 -map 1.0 &
+
+   sleep 5
+   jack_connect jack_rack:out_1 ffmpeg:input_1
+   jack_connect jack_rack:out_2 ffmpeg:input_2
+   #jack_connect jack_rack:out_1 ffmpeg:input_1
+   #jack_connect jack_rack:out_2 ffmpeg:input_2
+
+   sleep 1
+   cat $fifo | tee "$dir/Pre-Barreau_-_Augustins_-_Video_Live_-_$now.ogg" | oggfwd -d "pb_video_live" -g "Teaching"  -n "pb_video_live" localhost 8000 source2parisson /pb_video_live.ogg &
+   ;;
+ 
+ stop)
+   jack_disconnect jack_rack:out_1 ffmpeg:input_1
+   jack_disconnect jack_rack:out_2 ffmpeg:input_2
+   pkill ffmpeg
+   ;;
+esac
+
+
+
+
+

diff --git a/tools/ffmpeg_dv_jack_fifo_usb b/tools/ffmpeg_dv_jack_fifo_usb
new file mode 100755 (executable)
index 0000000..f8da11b
--- /dev/null
+++ b/tools/ffmpeg_dv_jack_fifo_usb
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+ start)
+   fifo=/tmp/video_fifo
+   if [ ! -e $fifo ]; then
+   mkfifo $fifo
+   fi
+
+   dir=$HOME/archives/2010/VIDEOS/
+   now=`date -R`
+
+   ffmpeg -f video4linux2 -i /dev/video1 -f jack -i ffmpeg -f ogg -r 20 -s 320x240 -vcodec libtheora -b 364k -acodec libvorbis -ab 64k -y $fifo -map 0.0 -map 1.0 &
+
+   sleep 5
+   jack_connect jack_rack:out_1 ffmpeg:input_1
+   #jack_connect jack_rack:out_1 ffmpeg:input_2
+
+   sleep 1
+   cat $fifo | tee "$dir/video_test-$now.ogg" | oggfwd -d "TeleCaster Live Video Services" -g "Vocal"  -n "TeleCaster Live Video" localhost 8000 source2parisson /telecaster_live_video.ogg &
+   ;;
+ 
+ stop)
+   jack_disconnect jack_rack:out_1 ffmpeg:input_1
+#   jack_disconnect jack_rack:out_1 ffmpeg:input_2
+   pkill -9 ffmpeg
+   ;;
+esac
+
+
+
+
+