[Debconf-video-commits] r115 - in package/trunk: debian src

[benh at alioth.debian.org]

Author: benh
Date: 2008-08-01 03:19:33 +0000 (Fri, 01 Aug 2008)
New Revision: 115

Modified:
   package/trunk/debian/changelog
   package/trunk/debian/rules
   package/trunk/src/dc-do-transcoding
Log:
Fixed ordering of arguments to ffmpeg in dc-do-transcoding.
Removed aspect override in dc-do-transcoding.
Added dc-do-transcoding to debconf-video-store package.


Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2008-07-30 00:23:25 UTC (rev 114)
+++ package/trunk/debian/changelog	2008-08-01 03:19:33 UTC (rev 115)
@@ -12,6 +12,9 @@
     - Implemented auto-reconnection to the database since the connection may
       be idle for long periods
     - Changed messages to be shorter and hopefully more readable
+    - Fixed ordering of arguments to ffmpeg
+    - Removed aspect override
+  * Added dc-do-transcoding to debconf-video-store package
   * Changes in dc-import-recordings:
     - Made deletion of database records for missing DV files optional
     - Made compatible with new schema

Modified: package/trunk/debian/rules
===================================================================
--- package/trunk/debian/rules	2008-07-30 00:23:25 UTC (rev 114)
+++ package/trunk/debian/rules	2008-08-01 03:19:33 UTC (rev 115)
@@ -23,7 +23,7 @@
 	mkdir -p -m 755 debian/debconf-video-encode
 	# debconf-video-store: scripts for the storage server
 	mkdir -p -m 755 debian/debconf-video-store/usr/bin debian/debconf-video-store/usr/share/debconf-video-store
-	install src/dc-import-recordings debian/debconf-video-store/usr/bin/
+	install src/dc-import-recordings src/dc-do-transcoding debian/debconf-video-store/usr/bin/
 	install -m 644 src/shellconfig.py debian/debconf-video-store/usr/share/debconf-video-store/
 
 binary-indep: install

Modified: package/trunk/src/dc-do-transcoding
===================================================================
--- package/trunk/src/dc-do-transcoding	2008-07-30 00:23:25 UTC (rev 114)
+++ package/trunk/src/dc-do-transcoding	2008-08-01 03:19:33 UTC (rev 115)
@@ -144,10 +144,9 @@
         # XXX The schema says that container_name is a
         # format name but we actually use it as a target
         # name here.
-        argv.extend(['-target', job.container_name,
-                     '-y', job.target_filename])
+        argv.extend(['-target', job.container_name])
         # video parameters
-        argv.extend(['-aspect', '4:3', '-deinterlace'])
+        argv.extend(['-deinterlace'])
         if job.video_width and job.video_height:
             argv.extend(['-s', '%dx%d' % (job.video_width, job.video_height)])
         argv.extend(['-vcodec', job.video_codec_name,
@@ -163,6 +162,8 @@
         argv.extend(['-author', author,
                      '-timestamp', str(job.recording_time)[:10], # ugh
                      '-copyright', author + '; ' + licence])
+        # output filename must come after all the output options
+        argv.extend(['-y', job.target_filename])
 
     job.command = argv_to_command_line(argv) + ' >%s.log 2>&1' % job.target_filename
     return True