Bugfix

Author: tmp-hallenser

lib/PHPExif/Adapter/FFprobe.php

@@ -46,8 +46,25 @@ public function getExifFromFile($file)
             return false;
         }
 
+        $ffprobe = null;
+        try {
+            // Let's try use the default paths
+            // No need to call exec(..) which takes time and might
+            // not be possible
+            $ffprobe = FFMpeg\FFProbe::create();
+        } catch (\Exception $e) {
+            // Let's try to pass paths explicitly
+            // @codeCoverageIgnoreStart
+            $path_ffmpeg = exec('which ffmpeg');
+            $path_ffprobe = exec('which ffprobe');
+            $ffprobe = FFMpeg\FFProbe::create(array(
+                     'ffmpeg.binaries'  => $path_ffmpeg,
+                     'ffprobe.binaries' => $path_ffprobe,
+                 ));
+            // @codeCoverageIgnoreEnd
+        }
+
 
-        $ffprobe = FFMpeg\FFProbe::create();
 
         $stream = $ffprobe->streams($file)->videos()->first()->all();
         $format = $ffprobe->format($file)->all();

lib/PHPExif/Mapper/Exiftool.php

@@ -55,7 +55,7 @@ class Exiftool implements MapperInterface
     const GPSLONGITUDE             = 'GPS:GPSLongitude';
     const GPSALTITUDE              = 'GPS:GPSAltitude';
     const IMGDIRECTION             = 'GPS:GPSImgDirection';
-    const DESCRIPTION              = 'IFD0:ImageDescription ';
+    const DESCRIPTION              = 'ExifIFD:ImageDescription ';
     const MAKE                     = 'IFD0:Make';
     const LENS                     = 'ExifIFD:LensModel';
     const SUBJECT                  = 'XMP-dc:Subject';