From c0049dce03920bfd0e841c6a7a0a7d0a4c7c2c5c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 23 Feb 2009 17:13:58 +0000 Subject: 1) Optimize the loop in graphics::generate so it uses the $ops as the key and path. This way it won't try to generate a resize for movies. 2) Changed the options on the ffmpeg command in movie::extract_image so we actually see a frame not the black one that starts the movie. --- core/helpers/graphics.php | 5 ++--- core/helpers/movie.php | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/helpers') diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php index 8418bd6b..a03d1f75 100644 --- a/core/helpers/graphics.php +++ b/core/helpers/graphics.php @@ -104,9 +104,7 @@ class graphics_Core { return; } - foreach (array("thumb" => $item->thumb_path(), - "resize" => $item->resize_path()) as $target => $output_file) { - + foreach ($ops as $target => $output_file) { if ($input_item->is_movie()) { // Convert the movie to a JPG first movie::extract_frame($input_file, $output_file); @@ -139,6 +137,7 @@ class graphics_Core { $item->resize_dirty = 0; } $item->save(); + print "exiting generate\n"; } /** diff --git a/core/helpers/movie.php b/core/helpers/movie.php index 4cd2e550..5d64aa1f 100644 --- a/core/helpers/movie.php +++ b/core/helpers/movie.php @@ -114,7 +114,8 @@ class movie_Core { } $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) . - " -t 0.001 -y -f mjpeg " . escapeshellarg($output_file); + " -an -ss 00:00:03 -an -r 1 -vframes 1" . + " -y -f mjpeg " . escapeshellarg($output_file); exec($cmd); } } -- cgit v1.2.3