Mercurial > repos > greg > ffmpeg

changeset 24:0609c266d650 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Thu, 19 Oct 2017 13:46:17 -0400
parents 533ddfd05522
children 3b06d705bcdb
files ffmpeg.xml
diffstat 1 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ffmpeg.xml	Wed Oct 18 14:30:53 2017 -0400
+++ b/ffmpeg.xml	Thu Oct 19 13:46:17 2017 -0400
@@ -21,9 +21,9 @@
         cp $input_filename input_dir/$full_name &&
     #end for
     #if str($output_process_log) == 'yes':
-        ffmpeg -r $conversion_cond.frame_rate -s 1920x1080 -i input_dir/%05d_predictions.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p output/out.mp4 2> $output_log &&
+        ffmpeg -r $conversion_cond.frame_rate -s 1920x1080 -i input_dir/*.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p output/out.mp4 2> $output_log &&
     #else:
-        ffmpeg -r $conversion_cond.frame_rate -s 1920x1080 -i input_dir/%05d_predictions.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p output/out.mp4 2> /dev/null &&
+        ffmpeg -r $conversion_cond.frame_rate -s 1920x1080 -i input_dir/*.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p output/out.mp4 2> /dev/null &&
     #end if
     mv output/out.mp4  $output_video
 #end if
@@ -63,6 +63,19 @@
     </outputs>
     <tests>
         <test>
+            <param name="conversion" value="images"/>
+            <param name="input">
+                <collection type="list">
+                    <element name="big_buck_bunny1.jpg" value="big_buck_bunny1.jpg"/>
+                    <element name="big_buck_bunny2.jpg" value="big_buck_bunny2.jpg"/>
+                    <element name="big_buck_bunny3.jpg" value="big_buck_bunny3.jpg"/>
+                </collection>
+            </param>
+            <param name="rame_rate" value="1"/>
+            <param name="quality" value="15"/>
+            <param name="output_process_log" value="yes"/>
+            <output name="output_video" file="output_video.mp4" ftype="mp4" compare="sim_size"/>
+            <output name="output_log" file="output_log.txt" ftype="txt"/>
         </test>
     </tests>
     <help>