Add an audio stream to ffmpeg files and support <Image> in hacks/make_dummy_files.

diff --git a/hacks/make_dummy_files b/hacks/make_dummy_files
index 6428348a434f6a45c4aaa1139950212d835d1510..f506b2545e7f5f1fe3fcff5e94d3c7b2aa1a2f9e 100755 (executable)
--- a/hacks/make_dummy_files
+++ b/hacks/make_dummy_files
@@ -13,6 +13,11 @@ if len(sys.argv) < 2:
 
 tree = ET.parse(os.path.join(sys.argv[1], 'metadata.xml'))
 
+try:
+    os.makedirs(os.path.join(sys.argv[1], 'dummy'))
+except:
+    pass
+
 for c in tree.getroot().find('Playlist').findall('Content'):
     type = c.find('Type').text
     if type == 'DCP':
@@ -76,6 +81,11 @@ for c in tree.getroot().find('Playlist').findall('Content'):
         video_frame_rate = int(c.find('VideoFrameRate').text)
         video_length = int(c.find('VideoLength').text)
         path = os.path.join(sys.argv[1], 'dummy', ntpath.basename(c.find('Path').text))
-        os.system('ffmpeg -t %d -s qcif -f rawvideo -pix_fmt rgb24 -r %d -i /dev/zero %s' % (float(video_length) / video_frame_rate, video_frame_rate, path))
+        os.system('ffmpeg -t %d -s qcif -f rawvideo -pix_fmt rgb24 -r %d -i /dev/zero -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=48000 -shortest "%s"' % (float(video_length) / video_frame_rate, video_frame_rate, path))
+    elif type == 'Image':
+        width = int(c.find('VideoWidth').text)
+        height = int(c.find('VideoHeight').text)
+        path = os.path.join(sys.argv[1], 'dummy', ntpath.basename(c.find('Path').text))
+        os.system('convert -size %dx%d xc:black "%s"' % (width, height, path))
     else:
         print 'Skipped %s' % type