adding animated gif and png support

Author: sharapov-outsource

examples/draw-animated-gif.php

@@ -1,10 +1,8 @@
 <?php
 /**
  * This file is part of PHP-FFmpeg-Extensions library.
- *
  * (c) Alexander Sharapov <alexander@sharapov.biz>
  * http://sharapov.biz/
- *
  */
 
 use \Sharapov\FFMpegExtensions\Input\File as InputFile;
@@ -15,39 +13,45 @@
 require_once 'init.php';
 
 // Open source video
-$video = $ffmpeg->open( new InputFile( 'source/demo_video_720p_HD.mp4' ) );
+$video = $ffmpeg->open(new InputFile('source/demo_video_720p_HD.mp4'));
 
 // Apply filter options to video
 $video
-  ->filters()
-  ->complex( new FilterComplexOptions\OptionsCollection( [
-                                                           ( ( new FilterComplexOptions\OptionOverlay() )
-                                                             // Set z-index property. Greater value is always in front
-                                                             ->setZIndex( 260 )
-                                                             // You can use fade-in and fade-out effects. Set time in seconds
-                                                             ->setFadeIn( 4 )
-                                                             ->setFadeOut( 4 )
-                                                             // Set image path
-                                                             ->setExtraInputStream( new InputFile( 'source/funny-cat-gif-3.gif' ) )
-                                                             // Coordinates where the text should be rendered. Accepts positive integer or
-                                                             // constants "(w-tw)/2", "(h-th)/2" to handle auto-horizontal, auto-vertical values
-                                                             ->setCoordinates( new Coordinate\Point( 230, 200 ) )
-                                                             // Set image dimensions
-                                                             ->setDimensions( new Coordinate\Dimension( 450, 200 ) )
-                                                             // Set timings (start, stop) in seconds. Accepts float values as well
-                                                             ->setTimeLine( new Coordinate\TimeLine( 3, 13 ) ) )
-                                                         ] ) );
+    ->filters()
+    ->complex(
+        new FilterComplexOptions\OptionsCollection([
+                                                       ((new FilterComplexOptions\OptionOverlay())
+                                                           // Set z-index property. Greater value is always in front
+                                                           ->setZIndex(260)
+                                                           // You can use fade-in and fade-out effects. Set time in seconds
+                                                           ->setFadeIn(2)
+                                                           ->setFadeOut(2)
+                                                           // Set image path
+                                                           ->setExtraInputStream(new InputFile('source/animated.gif'))
+                                                           // Coordinates where the text should be rendered. Accepts positive integer or
+                                                           // constants "(w-tw)/2", "(h-th)/2" to handle auto-horizontal, auto-vertical values
+                                                           ->setCoordinates(new Coordinate\Point(230, 200))
+                                                           // Set image dimensions
+                                                           //->setDimensions(new Coordinate\Dimension(450, 200))
+                                                           // Set timings (start, stop) in seconds. Accepts float values as well
+                                                           ->setTimeLine(new Coordinate\TimeLine(3, 13)))
+                                                   ]));
 
 // Run render
-$format = new \FFMpeg\Format\Video\X264( 'libmp3lame' );
-$format->on( 'progress', function ( $video, $format, $percentage ) {
+$format = new \FFMpeg\Format\Video\X264('libmp3lame');
+$format->on('progress', function($video, $format, $percentage) {
   echo "$percentage% transcoded\n";
-} );
+});
 
 try {
   $video
-    ->save( $format, 'output/output.mp4' );
+      ->save($format, 'output/output.mp4');
   print 'Done!';
-} catch ( ExecutionFailureException $e ) {
+} catch (ExecutionFailureException $e) {
   print $e->getMessage();
-}
+}
+
+/*
+ * -loop 1
+ "ffmpeg-20170915-6743351-win64-static/bin/ffmpeg.exe" -y -i "source/demo_video_720p_HD.mp4" -ignore_loop 0 -i "source/animated.gif" -filter_complex "[1:v]format=yuva420p,scale=450:200,fade=t=in:st=0:d=4:alpha='1',fade=t=out:st=9:d=4:alpha='1'[t1],[0:v][t1]overlay=230:200:shortest='1':enable='between(t,3,13)'" -threads 12 -vcodec libx264 -acodec libmp3lame -b:v 1000k -refs 6 -coder 1 -sc_threshold 40 -flags +loop -me_range 16 -subq 7 -i_qfactor 0.71 -qcomp 0.6 -qdiff 4 -trellis 1 -b:a 128k "output/output.mp4"
+ */

examples/draw-overlay-image.php

@@ -13,7 +13,7 @@
 require_once 'init.php';
 
 // Open source video
-$video = $ffmpeg->open(new InputFile('source/Coast - 1270.mp4'));
+$video = $ffmpeg->open(new InputFile('source/demo_video_720p_HD.mp4'));
 
 // Create complex filter collection
 $options = new FilterComplexOptions\OptionsCollection();

examples/source/animated-spinner.apng

@@ -132,10 +132,16 @@ public function apply(Video $video, VideoInterface $format) {
           // We need to save last stream id to apply next options in the correct order
           $lastStreamId = 's' . $stm;
           // For image overlay we have to add -loop 1 before input
-          if($option->isImage()) {
+          if($option->isStaticImage()) {
             $this->_extraInputs[] = '-loop';
             $this->_extraInputs[] = '1';
           }
+
+          if($option->isAnimatedGif() or $option->isAnimatedPng()) {
+            $this->_extraInputs[] = '-ignore_loop';
+            $this->_extraInputs[] = '0';
+          }
+
           // Pass input paths to the separate array
           $this->setExtraInput($option->getExtraInputStream());
           $imn++;

examples/source/animated.gif

@@ -15,14 +15,13 @@ trait CoordinatesTrait {
 
   /**
    * Returns coordinates object.
-   * @return mixed
+   *
+   * @param bool $returnDefault
+   *
+   * @return \Sharapov\FFMpegExtensions\Coordinate\Point|string
    */
-  public function getCoordinates() {
-    if(!$this->_coordinates instanceof Point) {
-      throw new InvalidArgumentException('Coordinates are empty.');
-    }
-
-    return $this->_coordinates;
+  public function getCoordinates($returnDefault = false) {
+    return ($this->_coordinates instanceof Point) ? $this->_coordinates : (($returnDefault) ? : $this->getDefaultCoordinates());
   }
 
   /**
@@ -37,4 +36,12 @@ public function setCoordinates(Point $point) {
 
     return $this;
   }
+
+  /**
+   * Gets default coordinates
+   * @return string
+   */
+  public function getDefaultCoordinates() {
+    return '0:0';
+  }
 }

examples/source/static.gif

@@ -16,14 +16,13 @@ trait DimensionsTrait {
 
   /**
    * Returns dimensions object.
-   * @return mixed
+   *
+   * @param bool $returnDefault
+   *
+   * @return \Sharapov\FFMpegExtensions\Coordinate\Dimension|string
    */
-  public function getDimensions() {
-    if(!$this->_dimensions instanceof Dimension) {
-      throw new InvalidArgumentException('Dimensions are empty.');
-    }
-
-    return $this->_dimensions;
+  public function getDimensions($returnDefault = false) {
+    return ($this->_dimensions instanceof Dimension) ? $this->_dimensions : (($returnDefault) ? : $this->getDefaultDimensions());
   }
 
   /**
@@ -38,4 +37,21 @@ public function setDimensions(Dimension $dimension) {
 
     return $this;
   }
+
+  /**
+   * Gets default dimensions
+   * @return string
+   */
+  public function getDefaultDimensions() {
+    if($this->isImage()) {
+      $dimensions = @getimagesize($this->getExtraInputStream()->getPath());
+      if($dimensions) {
+        return sprintf('%s:%s', $dimensions[0], $dimensions[1]);
+      }
+    } else {
+      throw new InvalidArgumentException('Due to performance issues we cannot automatically detect non-image overlay dimensions. Please set them before encoding.');
+    }
+
+    return '0:0';
+  }
 }

examples/source/static.png

@@ -7,6 +7,7 @@
 
 namespace Sharapov\FFMpegExtensions\Filters\Video\FilterComplexOptions;
 
+use Sharapov\FFMpegExtensions\Coordinate\Dimension;
 use Sharapov\FFMpegExtensions\Coordinate\Point;
 use Sharapov\FFMpegExtensions\Coordinate\TimeLine;
 use Sharapov\FFMpegExtensions\Filters\ExtraInputStreamInterface;
@@ -43,30 +44,6 @@ public function getFormat() {
     return $this->getProbe()->format($this->getExtraInputStream()->getPath());
   }
 
-  function isAnimatedGif($filename) {
-    return (bool)preg_match('#(\x00\x21\xF9\x04.{4}\x00\x2C.*){2,}#s', file_get_contents($filename));
-  }
-
-  function identify_apng($filename) {
-    $img_bytes = file_get_contents($filename);
-    if($img_bytes) {
-      if(strpos(substr($img_bytes, 0, strpos($img_bytes, 'IDAT')),
-                'acTL') !== false) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  # Identifies APNGs
-  # Written by Coda, functionified by Foone/Popcorn Mariachi#!9i78bPeIxI
-  # This code is in the public domain
-  # identify_apng returns:
-  # true if the file is an APNG
-  # false if it is any other sort of file (it is not checked for PNG validity)
-  # takes on argument, a filename.
-
   /**
    * Returns a command string.
    * @return string
@@ -80,8 +57,6 @@ public function __toString() {
    * @return string
    */
   public function getCommand() {
-    $coordinates = ($this->getCoordinates() instanceof Point) ? (string)$this->getCoordinates() : '0:0';
-
     if($this->getTimeLine() instanceof TimeLine) {
       $timeLine = sprintf(":%s", (string)$this->getTimeLine());
     } else {
@@ -108,17 +83,53 @@ public function getCommand() {
     }
 
     // We have to add shortest=1 for images to stop the overlay when the main video ends
-    if($this->isImage()) {
+    if($this->isStaticImage() or $this->isAnimatedGif() or $this->isAnimatedPng()) {
       $shortest = ":shortest='1'";
     } else {
       $shortest = '';
     }
 
-    return sprintf("[%s]format=yuva420p,scale=%s%s[%s],[%s][%s]overlay=%s%s%s[%s]", ':s1', (string)$this->getDimensions(), $fadeTime, ':s2', ':s3', ':s4', $coordinates, $shortest, $timeLine, ':s5');
+    return sprintf("[%s]format=yuva420p,scale=%s%s[%s],[%s][%s]overlay=%s%s%s[%s]", ':s1', (string)$this->getDimensions(), $fadeTime, ':s2', ':s3', ':s4', (string)$this->getCoordinates(), $shortest, $timeLine, ':s5');
+  }
+
+  /**
+   * Checks if overlay is static image (not animated gif or png).
+   * @return bool
+   */
+  public function isStaticImage() {
+    return true === $this->isImage() and false === $this->isAnimatedGif() and false === $this->isAnimatedPng();
+  }
+
+  /**
+   * Detect animated gif
+   * @return bool
+   */
+  public function isAnimatedGif() {
+    return (bool)preg_match('#(\x00\x21\xF9\x04.{4}\x00\x2C.*){2,}#s', @file_get_contents($this->getExtraInputStream()->getPath()));
+  }
+
+  /**
+   * Identifies APNGs
+   * Written by Coda, functionified by Foone/Popcorn Mariachi#!9i78bPeIxI
+   * This code is in the public domain
+   * Returns: true if the file is an APNG, false if it is any other sort of file (it is not checked for PNG validity)
+   * takes on argument, a filename.
+   * @return bool
+   */
+  public function isAnimatedPng() {
+    $img_bytes = @file_get_contents($this->getExtraInputStream()->getPath());
+    if($img_bytes) {
+      if(strpos(substr($img_bytes, 0, strpos($img_bytes, 'IDAT')),
+                'acTL') !== false) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
   /**
-   * Checks if overlay is image.
+   * Checks if overlay is image (both static or animated)
    * @return bool
    */
   public function isImage() {