[Debconf-video-commits] r108 - in package/trunk/conf: . dc8
holger at alioth.debian.org
holger at alioth.debian.org
Sun Jul 20 15:53:57 UTC 2008
Author: holger
Date: 2008-07-20 15:53:56 +0000 (Sun, 20 Jul 2008)
New Revision: 108
Added:
package/trunk/conf/dc8/
package/trunk/conf/video-data.sql
Removed:
package/trunk/conf/dc8/dc7-video-data.sql
package/trunk/conf/dc8/default-bof1
package/trunk/conf/dc8/default-bof2
package/trunk/conf/dc8/dvswitchrc-bof1
package/trunk/conf/dc8/dvswitchrc-bof2
Modified:
package/trunk/conf/dc8/default-barney
package/trunk/conf/dc8/default-talk1
package/trunk/conf/dc8/default-talk2
package/trunk/conf/dc8/dvswitchrc-talk2
package/trunk/conf/default
Log:
adopted for dc8
Copied: package/trunk/conf/dc8 (from rev 101, package/trunk/conf/dc7)
Deleted: package/trunk/conf/dc8/dc7-video-data.sql
===================================================================
--- package/trunk/conf/dc7/dc7-video-data.sql 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/dc7-video-data.sql 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,66 +0,0 @@
--- Data that we need to set up in advance and don't expect to update
--- regularly.
-
-DELETE FROM video_file_status;
-INSERT INTO video_file_status(file_status_code, file_status_desc)
-VALUES('X', 'Unchecked file');
-INSERT INTO video_file_status(file_status_code, file_status_desc)
-VALUES('A', 'File is valid (player reports no errors) and audio and video are excellent');
-INSERT INTO video_file_status(file_status_code, file_status_desc)
-VALUES('B', 'File is valid (player reports no errors) and audio and video are good');
-INSERT INTO video_file_status(file_status_code, file_status_desc)
-VALUES('C', 'File is valid (player reports no errors) but audio or video is poor');
-INSERT INTO video_file_status(file_status_code, file_status_desc)
-VALUES('F', 'File is invalid (player reports errors) or audio or video is unacceptable');
-
-DELETE FROM video_target_format;
-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
-)
-VALUES(
- 'archival', 100, 'ogg', '.ogg',
- 0, 0, 'theora', 4000000,
- 0, 0, 'vorbis', 192000
-);
-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
-)
-VALUES(
- 'high', 25, 'ogg', '.ogg',
- 0, 0, 'theora', 1500000,
- 0, 0, 'vorbis', 128000
-);
-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
-)
-VALUES(
- 'low', 50, 'ogg', '.ogg',
- 320, 240, 'theora', 230000,
- 32000, 1, 'vorbis', 64000
-);
-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
-)
-VALUES(
- 'ntsc-dvd', 0, 'ntsc-dvd', '.mpeg',
- 352, 240, 'mpeg1video', 220000,
- 48000, 2, 'ac3', 128000
-);
-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
-)
-VALUES(
- 'pal-dvd', 0, 'pal-dvd', '.mpeg',
- 352, 240, 'mpeg1video', 220000,
- 48000, 2, 'mp2', 128000
-);
Modified: package/trunk/conf/dc8/default-barney
===================================================================
--- package/trunk/conf/dc7/default-barney 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/default-barney 2008-07-20 15:53:56 UTC (rev 108)
@@ -4,4 +4,4 @@
#DATABASE_PASSWORD=
# File store base directory
FILE_BASE="/video"
-ENCODING_HOSTS="donald mickey daffy"
+ENCODING_HOSTS="daffy"
Deleted: package/trunk/conf/dc8/default-bof1
===================================================================
--- package/trunk/conf/dc7/default-bof1 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/default-bof1 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,18 +0,0 @@
-# Name of the location from which we are recording
-VENUE_NAME="Teviot House, Edinburgh, Scotland"
-ROOM_NAME="Lower BoF Room"
-# Sources and sinks
-SOURCES="firewire:itchy"
-SINKS="icecast:mickey file:barney"
-# Icecast streaming server parameters
-ICECAST_ADDR=int-master.video.debconf.org
-ICECAST_PORT=8000
-ICECAST_PASS=hackme
-# Stream encoding parameters
-VIDEO_STREAM_WIDTH=320
-VIDEO_STREAM_HEIGHT=240
-VIDEO_STREAM_KBPS=230
-AUDIO_STREAM_HZ=32000
-AUDIO_STREAM_KBPS=64
-# File store base directory
-FILE_BASE="/video"
Deleted: package/trunk/conf/dc8/default-bof2
===================================================================
--- package/trunk/conf/dc7/default-bof2 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/default-bof2 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,18 +0,0 @@
-# Name of the location from which we are recording
-VENUE_NAME="Teviot House, Edinburgh, Scotland"
-ROOM_NAME="Upper BoF Room"
-# Sources and sinks
-SOURCES="firewire:scratchy"
-SINKS="icecast:donald file:barney"
-# Icecast streaming server parameters
-ICECAST_ADDR=int-master.video.debconf.org
-ICECAST_PORT=8000
-ICECAST_PASS=hackme
-# Stream encoding parameters
-VIDEO_STREAM_WIDTH=320
-VIDEO_STREAM_HEIGHT=240
-VIDEO_STREAM_KBPS=230
-AUDIO_STREAM_HZ=32000
-AUDIO_STREAM_KBPS=64
-# File store base directory
-FILE_BASE="/video"
Modified: package/trunk/conf/dc8/default-talk1
===================================================================
--- package/trunk/conf/dc7/default-talk1 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/default-talk1 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,8 +1,8 @@
# Name of the location from which we are recording
-VENUE_NAME="Teviot House, Edinburgh, Scotland"
-ROOM_NAME="Upper Talk Room"
+VENUE_NAME="Hotel Dorada, Mar de la Plata, Argentina"
+ROOM_NAME="Salon del Mar"
# Sources and sinks
-SOURCES="firewire:selma firewire:shadow firewire:hashbaz"
+SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
SINKS="icecast:daffy file:barney"
# Icecast streaming server parameters
ICECAST_ADDR=int-master.video.debconf.org
Modified: package/trunk/conf/dc8/default-talk2
===================================================================
--- package/trunk/conf/dc7/default-talk2 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/default-talk2 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,9 +1,9 @@
# Name of the location from which we are recording
-VENUE_NAME="Teviot House, Edinburgh, Scotland"
-ROOM_NAME="Basement Talk Room"
+VENUE_NAME="Hotel Dorada, Mar de la Plata Argentina"
+ROOM_NAME="Microcine"
# Sources and sinks
-SOURCES="firewire:patty firewire:mrwhite/0 firewire:mrwhite/1"
-SINKS="icecast:donald file:barney"
+SOURCES="firewire:itchy/0 firewire:itchy/1 firewire:scratchy"
+SINKS="icecast:daffy file:barney"
# Icecast streaming server parameters
ICECAST_ADDR=int-master.video.debconf.org
ICECAST_PORT=8000
Deleted: package/trunk/conf/dc8/dvswitchrc-bof1
===================================================================
--- package/trunk/conf/dc7/dvswitchrc-bof1 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/dvswitchrc-bof1 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,2 +0,0 @@
-MIXER_HOST=itchy
-MIXER_PORT=4321
Deleted: package/trunk/conf/dc8/dvswitchrc-bof2
===================================================================
--- package/trunk/conf/dc7/dvswitchrc-bof2 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/dvswitchrc-bof2 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,2 +0,0 @@
-MIXER_HOST=scratchy
-MIXER_PORT=4321
Modified: package/trunk/conf/dc8/dvswitchrc-talk2
===================================================================
--- package/trunk/conf/dc7/dvswitchrc-talk2 2008-06-26 22:26:50 UTC (rev 101)
+++ package/trunk/conf/dc8/dvswitchrc-talk2 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,2 +1,2 @@
-MIXER_HOST=mrwhite
+MIXER_HOST=scratchy
MIXER_PORT=4321
Modified: package/trunk/conf/default
===================================================================
--- package/trunk/conf/default 2008-07-17 21:19:52 UTC (rev 107)
+++ package/trunk/conf/default 2008-07-20 15:53:56 UTC (rev 108)
@@ -1,4 +1,5 @@
# Name of the location from which we are recording
+CONFERENCE_NAME='DebConf8'
VENUE_NAME="unknown venue"
ROOM_NAME="unknown room"
# Sources and sinks
Added: package/trunk/conf/video-data.sql
===================================================================
--- package/trunk/conf/video-data.sql (rev 0)
+++ package/trunk/conf/video-data.sql 2008-07-20 15:53:56 UTC (rev 108)
@@ -0,0 +1,66 @@
+-- Data that we need to set up in advance and don't expect to update
+-- regularly.
+
+DELETE FROM video_file_status;
+INSERT INTO video_file_status(file_status_code, file_status_desc)
+VALUES('X', 'Unchecked file');
+INSERT INTO video_file_status(file_status_code, file_status_desc)
+VALUES('A', 'File is valid (player reports no errors) and audio and video are excellent');
+INSERT INTO video_file_status(file_status_code, file_status_desc)
+VALUES('B', 'File is valid (player reports no errors) and audio and video are good');
+INSERT INTO video_file_status(file_status_code, file_status_desc)
+VALUES('C', 'File is valid (player reports no errors) but audio or video is poor');
+INSERT INTO video_file_status(file_status_code, file_status_desc)
+VALUES('F', 'File is invalid (player reports errors) or audio or video is unacceptable');
+
+DELETE FROM video_target_format;
+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
+)
+VALUES(
+ 'archival', 100, 'ogg', '.ogg',
+ 0, 0, 'theora', 4000000,
+ 0, 0, 'vorbis', 192000
+);
+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
+)
+VALUES(
+ 'high', 25, 'ogg', '.ogg',
+ 0, 0, 'theora', 1500000,
+ 0, 0, 'vorbis', 128000
+);
+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
+)
+VALUES(
+ 'low', 50, 'ogg', '.ogg',
+ 320, 240, 'theora', 230000,
+ 32000, 1, 'vorbis', 64000
+);
+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
+)
+VALUES(
+ 'ntsc-dvd', 0, 'ntsc-dvd', '.mpeg',
+ 352, 240, 'mpeg1video', 220000,
+ 48000, 2, 'ac3', 128000
+);
+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
+)
+VALUES(
+ 'pal-dvd', 0, 'pal-dvd', '.mpeg',
+ 352, 240, 'mpeg1video', 220000,
+ 48000, 2, 'mp2', 128000
+);
More information about the Debconf-video-commits
mailing list