[Debconf-video-commits] r411 - package/branches/pycon09/src

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-28 18:09:39 +0000 (Sat, 28 Mar 2009)
New Revision: 411

Modified:
   package/branches/pycon09/src/dc-do-transcoding
Log:
Fix up metadata variables for both ffmpeg and ffmpeg2theora.


Modified: package/branches/pycon09/src/dc-do-transcoding
===================================================================
--- package/branches/pycon09/src/dc-do-transcoding	2009-03-28 17:39:51 UTC (rev 410)
+++ package/branches/pycon09/src/dc-do-transcoding	2009-03-28 18:09:39 UTC (rev 411)
@@ -97,6 +97,11 @@
         else:
             return False
 
+    author = config['PUBLISH_AUTHOR']
+    organisation = config['PUBLISH_ORG']
+    licence = config['PUBLISH_LICENSE']
+    venue = config['VENUE_NAME']
+
     # Use ffmpeg2theora if possible, otherwise ffmpeg
     if ((job.container_name, job.video_codec_name, job.audio_codec_name)
         == ('ogg', 'theora', 'vorbis')):
@@ -122,12 +127,12 @@
             argv.extend(['-c', str(job.audio_channel_count)])
         argv.extend(['-A', str(job.audio_bit_rate // 1000)])
         # metadata
-        argv.extend(['--artist', config['PUBLISH_AUTHOR'],
-                     '--location', config['VENUE_NAME'],
+        argv.extend(['--artist', author,
+                     '--location', venue,
                      '--date', str(job.recording_time)[:10], # ugh
-                     '--organization', config['PUBLISH_ORG'],
-                     '--copyright', config['PUBLISH_AUTHOR'],
-                     '--license', config['PUBLISH_LICENSE']])
+                     '--organization', organisation,
+                     '--copyright', author,
+                     '--license', licence])
     else:
         argv = ['ffmpeg']
         # input, output