Debugging output in OStatus for easier reading+greping

[quix0rs-gnu-social.git] / plugins / VideoThumbnails / VideoThumbnailsPlugin.php

diff --git a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
index 42f45571eb60dba51cec227af06624cf3e8297f8..e8cf7e31f2330ff6b9d9792bd8284383ab5dfda2 100644 (file)
--- a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
+++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
@@ -2,7 +2,7 @@
 /**
  * GNU social - a federating social network
  *
- * Plugin to make thumbnails of video files with ffmpeg
+ * Plugin to make thumbnails of video files with ffmpeg/avconv
  *
  * PHP version 5
  *
@@ -31,10 +31,13 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 /*
  * Dependencies:
- *  php5-ffmpeg
+ *  ffmpeg/avconv (external program call)
  *  php5-gd
  *
- * Video support will depend on your ffmpeg.
+ * Todo:
+ *  Make sure we support ffmpeg too, so we're not super Debian oriented.
+ *
+ * Video support will depend on your ffmpeg/avconv.
  */
 
 class VideoThumbnailsPlugin extends Plugin
@@ -44,38 +47,38 @@ class VideoThumbnailsPlugin extends Plugin
      * and disregard any cropping or scaling in the resulting file, as
      * that will be handled in the core thumbnail algorithm.
      */
-    public function onCreateFileImageThumbnailSource(MediaFile $file, &$imgPath, $media=null)
+    public function onCreateFileImageThumbnailSource(File $file, &$imgPath, $media=null)
     {
         // The calling function might accidentally pass application/ogg videos.
         // If that's a problem, let's fix it in the calling function.
-        if ($media !== 'video') {
+        if ($media !== 'video' || empty($file->filename)) {
             return true;
         }
 
-        $movie = new ffmpeg_movie($file->getPath(), false);
+        // Let's save our frame to a temporary file. If we fail, remove it.
+        $tmp_imgPath = tempnam(sys_get_temp_dir(), 'socialthumb-');
 
-        $frames = $movie->getFrameCount();
-        if ($frames > 0) {
-            $frame = $movie->getFrame(floor($frames/2));
+        $cmd = null;
+        if (shell_exec('which ffmpeg')) {
+            $cmd = 'ffmpeg';
+        } elseif (shell_exec('which avconv')) {
+            $cmd = 'avconv';
         } else {
-            $frame = $movie->getNextKeyFrame();
-        }
-
-        // We failed to get a frame.
-        if ($frame === null) {
+            common_log(LOG_ERR, 'Neither ffmpeg nor avconv was found in your PATH. Cannot create video thumbnail.');
             return true;
         }
+        $result = exec($cmd.' -y -i '.escapeshellarg($file->getPath()).' -vcodec mjpeg -vframes 1 -f image2 -an '.escapeshellarg($tmp_imgPath));
 
-        // Let's save our frame to a temporary file. If we fail, remove it.
-        $imgPath = tempnam(sys_get_temp_dir(), 'socialthumb');
-        if (!imagejpeg($frame->toGDImage(), $imgPath)) {
-            @unlink($imgPath);
+        if (!getimagesize($tmp_imgPath)) {
+            common_debug('exec of "avconv" produced a bad/nonexisting image it seems');
+            @unlink($tmp_imgPath);
             return true;
         }
+        $imgPath = $tmp_imgPath;
         return false;
     }
 
-    public function onPluginVersion(&$versions)
+    public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Video Thumbnails',
                             'version' => GNUSOCIAL_VERSION,