[Debconf-video-commits] r319 - package/branches/pycon09/conf

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-15 23:36:03 +0000 (Sun, 15 Mar 2009)
New Revision: 319

Modified:
   package/branches/pycon09/conf/default
   package/branches/pycon09/conf/video-data.sql
Log:
Adjust configuration for PyCon. Database config is unspecified for now.


Modified: package/branches/pycon09/conf/default
===================================================================
--- package/branches/pycon09/conf/default	2009-03-15 23:19:55 UTC (rev 318)
+++ package/branches/pycon09/conf/default	2009-03-15 23:36:03 UTC (rev 319)
@@ -1,14 +1,14 @@
 # Name of the location from which we are recording
-CONFERENCE_NAME='DebConf8'
-VENUE_NAME="unknown venue"
+CONFERENCE_NAME='PyCon 2009'
+VENUE_NAME="Hyatt Regency O'Hare Hotel, Chicago, USA"
 ROOM_NAME="unknown room"
 # Sources and sinks
 SOURCES="firewire:localhost"
 SINKS="file:localhost"
 # Icecast streaming server parameters
-ICECAST_ADDR=int-master.video.debconf.org
+#ICECAST_ADDR=
 ICECAST_PORT=8000
-ICECAST_PASS=hackme
+#ICECAST_PASS=
 # Stream encoding parameters
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
@@ -18,6 +18,6 @@
 # File store base directory
 FILE_BASE="/video"
 # Database access (pygresql)
-DATABASE_DSN="localhost:pentabarf"
-DATABASE_USER="pentabarf"
+#DATABASE_DSN=
+#DATABASE_USER=
 #DATABASE_PASSWORD=

Modified: package/branches/pycon09/conf/video-data.sql
===================================================================
--- package/branches/pycon09/conf/video-data.sql	2009-03-15 23:19:55 UTC (rev 318)
+++ package/branches/pycon09/conf/video-data.sql	2009-03-15 23:36:03 UTC (rev 319)
@@ -33,9 +33,9 @@
     published
 )
 VALUES(
-    'high', 25, 'ogg', '.ogg',
-    0, 0, 'theora', 1500000,
-    0, 0, 'vorbis', 128000,
+    'high-mpeg4', 25, 'mp4', '.mp4',
+    0, 0, 'libx264', 1500000,
+    0, 0, 'libfaac', 128000,
     true
 );
 INSERT INTO video_target_format(
@@ -45,32 +45,8 @@
     published
 )
 VALUES(
-    'low', 50, 'ogg', '.ogg',
+    'low-ogg', 50, 'ogg', '.ogv',
     320, 240, 'theora', 230000,
     32000, 1, 'vorbis', 64000,
     true
 );
-INSERT INTO video_target_format(
-    target_format_abbr, priority, container_name, filename_extension,
-    video_width, video_height, video_codec_name, video_bit_rate,
-    audio_sample_rate, audio_channel_count, audio_codec_name, audio_bit_rate,
-    published
-)
-VALUES(
-    'ntsc-dvd', 0, 'ntsc-dvd', '.mpeg',
-    352, 240, 'mpeg1video', 220000,
-    48000, 2, 'ac3', 128000,
-    false
-);
-INSERT INTO video_target_format(
-    target_format_abbr, priority, container_name, filename_extension,
-    video_width, video_height, video_codec_name, video_bit_rate,
-    audio_sample_rate, audio_channel_count, audio_codec_name, audio_bit_rate,
-    published
-)
-VALUES(
-    'pal-dvd', 0, 'pal-dvd', '.mpeg',
-    352, 240, 'mpeg1video', 220000,
-    48000, 2, 'mp2', 128000,
-    false
-);