Implemented support for multiple file types for getFrameAtTime

Some other generic cleanup.

Author: ABM-Dan

FFmpegAnimatedGif.php

@@ -72,7 +72,6 @@ class FFmpegAnimatedGif implements Serializable {
     * @param int $height Height of the animated gif.   
     * @param int $frameRate Frame rate of the animated gif in frames per second.
     * @param int $loopCount Number of times to loop the animation. Put a zero here to loop forever or omit this parameter to disable looping.
-    * @return FFmpegAnimatedGif
     */
     public function __construct($outFilePath, $width, $height, $frameRate, $loopCount) {
         $this->outFilePath = $outFilePath;
@@ -105,8 +104,6 @@ public function addFrame(FFmpegFrame $frame) {
     * @return void 
     */
     protected function addGifHeader() {
-        $cmap = 0;
-
         if (ord($this->frames[0]{10}) & 0x80) {
             $cmap = 3 * (2 << (ord($this->frames[0]{10}) & 0x07));
 
@@ -140,6 +137,8 @@ protected function addFrameData($i, $d) {
 
         $Locals_ext = "!\xF9\x04".chr(($DIS << 2 ) + 0). chr(($d >> 0) & 0xFF).chr(($d >> 8) & 0xFF)."\x0\x0";
 
+        $Locals_img = null;
+
         if ($COL > -1 && ord($this->frames[$i]{10}) & 0x80) {
             for ($j = 0; $j < (2 << (ord($this->frames[$i]{10}) & 0x07)); $j++) {
                 if (ord($Locals_rgb{3 * $j + 0}) == (($COL >> 16 ) & 0xFF) 

FFmpegFrame.php

@@ -44,7 +44,6 @@ class FFmpegFrame implements Serializable {
     * @param resource $gdImage image resource of type gd
     * @param float $pts frame presentation timestamp; OPTIONAL parameter; DEFAULT value 0.0
     * @throws Exception
-    * @return FFmpegFrame
     */
     public function __construct($gdImage, $pts = 0.0) {
         if (!(is_resource($gdImage) && get_resource_type($gdImage) == 'gd')) {

FFmpegMovie.php

@@ -196,8 +196,7 @@ class FFmpegMovie implements Serializable {
     * @param string $moviePath full path to the movie file
     * @param OutputProvider $outputProvider provides parsable output
     * @param string $ffmpegBinary ffmpeg executable, if $outputProvider not specified
-    * @throws Exception 
-    * @return FFmpegMovie
+    * @throws Exception
     */
     public function __construct($moviePath, OutputProvider $outputProvider = null, $ffmpegBinary = 'ffmpeg') {
         $this->movieFile       = $moviePath;
@@ -652,7 +651,8 @@ public function getFrame($framenumber = null, $height = null, $width = null, $qu
     */
 	 public function getFrameAtTime($seconds = null, $width = null, $height = null, $quality = null, $frameFilePath = null, &$output = null) {
         // Set frame position for frame extraction
-        $frameTime = ($seconds === null) ? 0 : $seconds;    
+        $frameTime = ($seconds === null) ? 0 : $seconds;
+
 
         // time out of range
         if (!is_numeric($frameTime) || $frameTime < 0 || $frameTime > $this->getDuration()) {
@@ -717,7 +717,17 @@ public function getFrameAtTime($seconds = null, $width = null, $height = null, $
         }
 
         // Create gdimage and delete temporary image
-        $gdImage = imagecreatefromjpeg($frameFilePath);
+        switch (getimagesize($frameFilePath)[2]) {
+            case IMAGETYPE_GIF:
+                $gdImage = imagecreatefromgif($frameFilePath);
+                break;
+            case IMAGETYPE_PNG:
+                $gdImage = imagecreatefrompng($frameFilePath);
+                break;
+            default:
+                $gdImage = imagecreatefromjpeg($frameFilePath);
+        }
+
         if ($deleteTmp && is_writable($frameFilePath)) {
             unlink($frameFilePath);
         }

adapter/ffmpeg_animated_gif.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * ffmpeg_animated_gif serves as a compatiblity adapter for old ffmpeg-php extension
+ * ffmpeg_animated_gif serves as a compatibility adapter for old ffmpeg-php extension
  * 
  * @author char0n (Vladimír Gorej, gorej@codescale.net)
  * @package FFmpegPHP

adapter/ffmpeg_frame.php

@@ -34,11 +34,11 @@ public function getPresentationTimestamp() {
     }
 
     public function resize($width, $height, $cropTop = 0, $cropBottom = 0, $cropLeft = 0, $cropRight = 0) {        
-        return $this->adaptee->resize($width, $height, $cropTop, $cropBottom, $cropLeft, $cropRight);
+        $this->adaptee->resize($width, $height, $cropTop, $cropBottom, $cropLeft, $cropRight);
     } 
 
     public function crop($cropTop, $cropBottom = 0, $cropLeft = 0, $cropRight = 0) {
-        return $this->adaptee->crop($cropTop, $cropBottom, $cropLeft, $cropRight);
+        $this->adaptee->crop($cropTop, $cropBottom, $cropLeft, $cropRight);
     }
 
     public function toGDImage() {