Merge pull request #7 from nshahzad/master

Allow quality and size changes through ffmpeg instead of GD
char0n · Nov 24, 2011 · 568e84c · 568e84c
2 parents c5d4638 + 562205d
commit 568e84c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.svn
 .buildpath
 .project
 .settings

diff --git a/FFmpegMovie.php b/FFmpegMovie.php
@@ -609,20 +609,46 @@ public function hasVideo() {
     *   * framenumber - Frame from the movie to return. If no framenumber is specified, returns the next frame of the movie. 
     * 
     * @param int $framenumber
+    * @param int $height
+    * @param int $width
+    * @param int $quality
     * @return FFmpegFrame|boolean
     */
-    public function getFrame($framenumber = null) {
+    public function getFrame($framenumber = null, $height = null, $width = null, $quality = null) {
         // Set frame position for frame extraction
         $framePos = ($framenumber === null) ? $this->frameNumber : (((int) $framenumber) - 1);    
 
         // Frame position out of range
         if (!is_numeric($framePos) || $framePos < 0 || $framePos > $this->getFrameCount()) {
             return false;
-        }        
-
+        }
+
+        if(is_numeric($height) !== false && is_numeric($width) !== false) {
+            $image_size = ' -s '.$height.'x'.$width;
+        } else {
+            $image_size = '';
+        }
+
+        if(is_numeric($quality) !== false) {
+            $quality = ' -qscale '.$quality;
+        } else {
+            $quality = '';
+        }
+
         $frameFilePath = sys_get_temp_dir().DIRECTORY_SEPARATOR.uniqid('frame', true).'.jpg';
         $frameTime     = round((($framePos / $this->getFrameCount()) * $this->getDuration()), 4);
-        exec($this->ffmpegBinary.' -ss '.$frameTime.' -i '.escapeshellarg($this->movieFile).' -vframes 1 '.$frameFilePath.' 2>&1');
+
+        exec(implode(' ', array(
+            $this->ffmpegBinary,
+            '-i '.escapeshellarg($this->movieFile),
+            '-f image2',
+            '-ss '.$frameTime,
+            '-vframes 1',            
+            $image_size,
+            $quality,
+            $frameFilePath, 
+            '2>&1',
+        )));
 
         // Cannot write frame to the data storage
         if (!file_exists($frameFilePath)) {