Merge pull request fluent-ffmpeg#700 from rhodgkins/stream-progress

Allow progress events with streams
riophae · Apr 23, 2017 · dcc052a · dcc052a
2 parents 9f492c3 + 4cbe28e
commit dcc052a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/processor.js b/lib/processor.js
@@ -21,7 +21,12 @@ var nlRegexp = /\r\n|\r|\n/g;
  * @private
  */
 function runFfprobe(command) {
-  command.ffprobe(0, function(err, data) {
+  const inputProbeIndex = 0;
+  if (command._inputs[inputProbeIndex].isStream) {
+    // Don't probe input streams as this will consume them
+    return;
+  }
+  command.ffprobe(inputProbeIndex, function(err, data) {
     command._ffprobeData = data;
   });
 }

diff --git a/lib/utils.js b/lib/utils.js
@@ -321,7 +321,6 @@ var utils = module.exports = {
    *
    * @param {FfmpegCommand} command event emitter
    * @param {String} stderrLine ffmpeg stderr data
-   * @param {Number} [duration=0] expected output duration in seconds
    * @private
    */
   extractProgress: function(command, stderrLine) {
@@ -333,7 +332,7 @@ var utils = module.exports = {
         frames: parseInt(progress.frame, 10),
         currentFps: parseInt(progress.fps, 10),
         currentKbps: progress.bitrate ? parseFloat(progress.bitrate.replace('kbits/s', '')) : 0,
-        targetSize: parseInt(progress.size, 10),
+        targetSize: parseInt(progress.size || progress.Lsize, 10),
         timemark: progress.time
       };