added input and output file information to the progress handler probe data

Author: buggedcom

src/PHPVideoToolkit/FfmpegProcess.php

@@ -546,6 +546,19 @@ public function isCompleted()
             return $this->_callExecBufferFunction('isCompleted');
         }
 
+        /**
+         * Returns the file name of the exec buffer output.
+         *
+         * @access public
+         * @author Oliver Lillie
+         * @see ExecBuffer::getBufferOutput
+         * @return string
+         */
+        public function getBufferOutput()
+        {
+            return $this->_callExecBufferFunction('getBufferOutput');
+        }
+        
         /**
          * Returns a boolean value determining if the process has completed.
          *
@@ -561,7 +574,7 @@ public function getPortableId()
                 throw new Exception('It is not possible to get a portable id as the exec process has been made blocking. To get a portable id make the process unblocking or call getPortableId() before the save occurs.');
             }
 
-            $output = $this->_callExecBufferFunction('getBufferOutput');
+            $output = $this->getBufferOutput();
             return substr($output, strrpos($output, 'phpvideotoolkit_')+16).'.'.$this->_callExecBufferFunction('getBoundary').'.'.time();
         }
     }

src/PHPVideoToolkit/ProgressHandlerDefaultData.php

@@ -40,6 +40,8 @@ protected function _getDefaultData()
                 'dup'        => 0,
                 'drop'       => 0,
                 'output_file'=> null,
+                'input_file' => null,
+                'process_file' => null,
             );
         }
 

src/PHPVideoToolkit/ProgressHandlerNative.php

@@ -20,6 +20,10 @@
      */
     class ProgressHandlerNative extends ProgressHandlerAbstract
     {
+        protected $_progress_file;
+        protected $_input_file;
+        protected $_output_file;
+        
         public function __construct($callback=null, Config $config=null)
         {
 //          check that the "-progress" function is available.
@@ -33,6 +37,8 @@ public function __construct($callback=null, Config $config=null)
             parent::__construct($callback, $config);
 
             $this->_progress_file = null;
+            $this->_input_file = null;
+            $this->_output_file = null;
         }
 
         protected function _getRawData()
@@ -50,6 +56,8 @@ protected function _parseOutputData(&$return_data, $raw_data)
         {
             $return_data['started'] = true;
 
+            $return_data['process_file'] = $this->_progress_file;
+
 //          parse out the details of the data into the seperate chunks.
             $parts = preg_split('/frame=/', $raw_data);
             array_shift($parts);

src/PHPVideoToolkit/ProgressHandlerOutput.php

@@ -24,6 +24,16 @@ protected function _parseOutputData(&$return_data, $raw_data)
         {
             $return_data['started'] = true;
 
+            if(preg_match('/Input\s#0,\s+[^\s]+,\s+from\s+(.*):/', $raw_data, $input_matches) > 0)
+            {
+                $return_data['input_file'] = trim($input_matches[1], '\'"');
+            }
+            if(preg_match('/Output\s#0,\s+[^\s]+,\s+to\s+(.*):/', $raw_data, $output_matches) > 0)
+            {
+                $return_data['output_file'] = trim($output_matches[1], '\'"');
+            }
+            $return_data['process_file'] = $this->_ffmpeg_process->getBufferOutput();
+            
 //          parse out the details of the data.
             if(preg_match_all(
                 '/frame=\s*([0-9]+)\s'.

src/PHPVideoToolkit/ProgressHandlerPortable.php

@@ -106,7 +106,6 @@ protected function _processOutputFile()
                 if($return_data['percentage'] >= 100)
                 {
                     $return_data['percentage'] = 100;
-                    $return_data['output_file'] = ''; // TODO
                     $return_data['run_time'] = filemtime($this->_output)-$this->_time_started;
                 }
 //              or if it has been interuptted 
@@ -188,6 +187,16 @@ protected function _parseOutputData(&$return_data, $raw_data)
             }            
             $total_duration = new Timecode($total_duration, Timecode::INPUT_FORMAT_TIMECODE);
 
+            if(preg_match('/Input\s#0,\s+[^\s]+,\s+from\s+(.*):/', $raw_data, $input_matches) > 0)
+            {
+                $return_data['input_file'] = trim($input_matches[1], '\'"');
+            }
+            if(preg_match('/Output\s#0,\s+[^\s]+,\s+to\s+(.*):/', $raw_data, $output_matches) > 0)
+            {
+                $return_data['output_file'] = trim($output_matches[1], '\'"');
+            }
+            $return_data['process_file'] = $this->_output;
+            
 //          parse out the details of the data.
             if(preg_match_all(
                 '/frame=\s*([0-9]+)\s'.
@@ -198,6 +207,7 @@ protected function _parseOutputData(&$return_data, $raw_data)
                 'bitrate=\s*([0-9\.]+\s?[bkBmg\/s]+)'.
                 '(\sdup=\s*([0-9]+))?'.
                 '(\sdrop=\s*([0-9]+))?'.
+                '(\sdrop=\s*([0-9]+))?'.
                 '/', $raw_data, $matches) > 0)
             {
                 $last_key = count($matches[0])-1;