diff options
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 19 | ||||
| -rw-r--r-- | modules/gallery/helpers/legal_file.php | 55 | ||||
| -rw-r--r-- | modules/gallery/helpers/movie.php | 54 | ||||
| -rw-r--r-- | modules/gallery/helpers/photo.php | 17 | ||||
| -rw-r--r-- | modules/gallery/module.info | 2 |
5 files changed, 118 insertions, 29 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 99bc3726..1f190800 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -314,7 +314,7 @@ class gallery_installer { module::set_var("gallery", "timezone", null); module::set_var("gallery", "lock_timeout", 1); - module::set_version("gallery", 51); + module::set_version("gallery", 52); } static function upgrade($version) { @@ -688,7 +688,7 @@ class gallery_installer { if ($version == 47 || $version == 48) { // Add configuration variable to set timezone. Defaults to the currently - // used timezone (from PHP configuration). Note that in v48 we werew + // used timezone (from PHP configuration). Note that in v48 we were // setting this value incorrectly, so we're going to stomp this value for v49. module::set_var("gallery", "timezone", null); module::set_version("gallery", $version = 49); @@ -716,12 +716,25 @@ class gallery_installer { } if ($version == 50) { - // In v50, a lock_timeout variable was added so that administrators could edit the time out + // In v51, we added a lock_timeout variable so that administrators could edit the time out // from 1 second to a higher variable if their system runs concurrent parallel uploads for // instance. module::set_var("gallery", "lock_timeout", 1); module::set_version("gallery", $version = 51); } + + if ($version == 51) { + // In v52, we added functions to the legal_file helper that map photo and movie file + // extensions to their mime types (and allow extension of the list by other modules). During + // this process, we correctly mapped m4v files to video/x-m4v, correcting a previous error + // where they were mapped to video/mp4. This corrects the existing items. + db::build() + ->update("items") + ->set("mime_type", "video/x-m4v") + ->where("name", "REGEXP", "\.m4v$") // case insensitive since name column is utf8_general_ci + ->execute(); + module::set_version("gallery", $version = 52); + } } static function uninstall() { diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php index bd48d7b7..b3622764 100644 --- a/modules/gallery/helpers/legal_file.php +++ b/modules/gallery/helpers/legal_file.php @@ -19,11 +19,53 @@ */ class legal_file_Core { /** + * Create a default list of allowed photo MIME types paired with their extensions and then let + * modules modify it. This is an ordered map, mapping extensions to their MIME types. + * Extensions cannot be duplicated, but MIMEs can (e.g. jpeg and jpg both map to image/jpeg). + * + * @param string $extension (opt.) - return MIME of extension; if not given, return complete array + */ + static function get_photo_types_by_extension($extension=NULL) { + $types_by_extension_wrapper = new stdClass(); + $types_by_extension_wrapper->types_by_extension = array( + "jpg" => "image/jpeg", "jpeg" => "image/jpeg", "gif" => "image/gif", "png" => "image/png"); + module::event("photo_types_by_extension", $types_by_extension_wrapper); + if ($extension) { + // return matching MIME type + return $types_by_extension_wrapper->types_by_extension[$extension]; + } else { + // return complete array + return $types_by_extension_wrapper->types_by_extension; + } + } + + /** + * Create a default list of allowed movie MIME types paired with their extensions and then let + * modules modify it. This is an ordered map, mapping extensions to their MIME types. + * Extensions cannot be duplicated, but MIMEs can (e.g. jpeg and jpg both map to image/jpeg). + * + * @param string $extension (opt.) - return MIME of extension; if not given, return complete array + */ + static function get_movie_types_by_extension($extension=NULL) { + $types_by_extension_wrapper = new stdClass(); + $types_by_extension_wrapper->types_by_extension = array( + "flv" => "video/x-flv", "mp4" => "video/mp4", "m4v" => "video/x-m4v"); + module::event("movie_types_by_extension", $types_by_extension_wrapper); + if ($extension) { + // return matching MIME type + return $types_by_extension_wrapper->types_by_extension[$extension]; + } else { + // return complete array + return $types_by_extension_wrapper->types_by_extension; + } + } + + /** * Create a default list of allowed photo extensions and then let modules modify it. */ static function get_photo_extensions() { $extensions_wrapper = new stdClass(); - $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png"); + $extensions_wrapper->extensions = array_keys(legal_file::get_photo_types_by_extension()); module::event("legal_photo_extensions", $extensions_wrapper); return $extensions_wrapper->extensions; } @@ -33,7 +75,7 @@ class legal_file_Core { */ static function get_movie_extensions() { $extensions_wrapper = new stdClass(); - $extensions_wrapper->extensions = array("flv", "mp4", "m4v"); + $extensions_wrapper->extensions = array_keys(legal_file::get_movie_types_by_extension()); module::event("legal_movie_extensions", $extensions_wrapper); return $extensions_wrapper->extensions; } @@ -63,20 +105,25 @@ class legal_file_Core { /** * Create a default list of allowed photo MIME types and then let modules modify it. + * Can be used to add legal alternatives for default MIME types. + * (e.g. flv maps to video/x-flv by default, but video/flv is still legal). */ static function get_photo_types() { $types_wrapper = new stdClass(); - $types_wrapper->types = array("image/jpeg", "image/gif", "image/png"); + $types_wrapper->types = array_values(legal_file::get_photo_types_by_extension()); module::event("legal_photo_types", $types_wrapper); return $types_wrapper->types; } /** * Create a default list of allowed movie MIME types and then let modules modify it. + * Can be used to add legal alternatives for default MIME types. + * (e.g. flv maps to video/x-flv by default, but video/flv is still legal). */ static function get_movie_types() { $types_wrapper = new stdClass(); - $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4"); + $types_wrapper->types = array_values(legal_file::get_movie_types_by_extension()); + $types_wrapper->types[] = "video/flv"; module::event("legal_movie_types", $types_wrapper); return $types_wrapper->types; } diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index b54811df..ddc513ea 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -63,21 +63,29 @@ class movie_Core { throw new Exception("@todo MISSING_FFMPEG"); } + list($width, $height, $mime_type, $extension, $duration) = movie::get_file_metadata($input_file); + + // extract frame at 0:03, unless movie is shorter than 4 sec. + $start_time_arg = ($duration > 4) ? " -ss 00:00:03" : ""; + $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) . - " -an -ss 00:00:03 -an -r 1 -vframes 1" . + " -an $start_time_arg -an -r 1 -vframes 1" . + " -s {$width}x{$height}" . " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1"; - exec($cmd); + exec($cmd, $exec_output, $exec_return); clearstatcache(); // use $filename parameter when PHP_version is 5.3+ - if (filesize($output_file) == 0) { - // Maybe the movie is shorter, fall back to the first frame. - $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) . - " -an -an -r 1 -vframes 1" . + if (filesize($output_file) == 0 || $exec_return) { + // Maybe the movie needs the "-threads 1" argument added + // (see http://sourceforge.net/apps/trac/gallery/ticket/1924) + $cmd = escapeshellcmd($ffmpeg) . " -threads 1 -i " . escapeshellarg($input_file) . + " -an $start_time_arg -an -r 1 -vframes 1" . + " -s {$width}x{$height}" . " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1"; - exec($cmd); + exec($cmd, $exec_output, $exec_return); clearstatcache(); - if (filesize($output_file) == 0) { + if (filesize($output_file) == 0 || $exec_return) { throw new Exception("@todo FFMPEG_FAILED"); } } @@ -96,7 +104,7 @@ class movie_Core { } /** - * Return the width, height, mime_type and extension of the given movie file. + * Return the width, height, mime_type, extension and duration of the given movie file. */ static function get_file_metadata($file_path) { $ffmpeg = movie::find_ffmpeg(); @@ -106,18 +114,32 @@ class movie_Core { $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($file_path) . " 2>&1"; $result = `$cmd`; - if (preg_match("/Stream.*?Video:.*?, (\d+)x(\d+)/", $result, $regs)) { - list ($width, $height) = array($regs[1], $regs[2]); + if (preg_match("/Stream.*?Video:.*?, (\d+)x(\d+)/", $result, $matches_res)) { + if (preg_match("/Stream.*?Video:.*? \[.*?DAR (\d+):(\d+).*?\]/", $result, $matches_dar) && + $matches_dar[1] >= 1 && $matches_dar[2] >= 1) { + // DAR is defined - determine width based on height and DAR + // (should always be int, but adding round to be sure) + $matches_res[1] = round($matches_res[2] * $matches_dar[1] / $matches_dar[2]); + } + list ($width, $height) = array($matches_res[1], $matches_res[2]); } else { list ($width, $height) = array(0, 0); } - $pi = pathinfo($file_path); - $extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension? Assume FLV. - $mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ? - "video/mp4" : "video/x-flv"; + $extension = strtolower(pathinfo($file_path, PATHINFO_EXTENSION)); + $extension = $extension ? $extension : "flv"; // No extension? Assume FLV. + $mime_type = legal_file::get_movie_types_by_extension($extension); + $mime_type = $mime_type ? $mime_type : "video/x-flv"; // No MIME found? Default to video/x-flv. + + if (preg_match("/Duration: (\d+):(\d+):(\d+\.\d+)/", $result, $matches)) { + $duration = 3600 * $matches[1] + 60 * $matches[2] + $matches[3]; + } else if (preg_match("/duration.*?:.*?(\d+)/", $result, $matches)) { + $duration = $matches[1]; + } else { + $duration = 0; + } - return array($width, $height, $mime_type, $extension); + return array($width, $height, $mime_type, $extension, $duration); } } diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 9f2951d5..c4001bd5 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -83,10 +83,17 @@ class photo_Core { */ static function get_file_metadata($file_path) { $image_info = getimagesize($file_path); - $width = $image_info[0]; - $height = $image_info[1]; - $mime_type = $image_info["mime"]; - $extension = image_type_to_extension($image_info[2], false); - return array($width, $height, $mime_type, $extension); + if ($image_info) { + $width = $image_info[0]; + $height = $image_info[1]; + $mime_type = $image_info["mime"]; + $extension = image_type_to_extension($image_info[2], false); + return array($width, $height, $mime_type, $extension); + } else { + // getimagesize failed - use legal_file mapping instead. + $extension = strtolower(pathinfo($file_path, PATHINFO_EXTENSION)); + $mime_type = legal_file::get_photo_types_by_extension($extension); + return array(0, 0, $mime_type, $extension); + } } } diff --git a/modules/gallery/module.info b/modules/gallery/module.info index 424c0c2d..faefd663 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,6 +1,6 @@ name = "Gallery 3" description = "Gallery core application" -version = 51 +version = 52 author_name = "Gallery Team" author_url = "http://codex.gallery2.org/Gallery:Team" info_url = "http://codex.gallery2.org/Gallery3:Modules:gallery" |