fluent-ffmpeg
Advanced tools
Comparing version 2.0.0-rc3 to 2.0.1
@@ -23,2 +23,5 @@ /*jshint node:true, laxcomma:true*/ | ||
return data; | ||
} else if (line.match(/^\[/)) { | ||
lines.unshift(line); | ||
return data; | ||
} | ||
@@ -43,6 +46,6 @@ | ||
while (line) { | ||
if (line === '[STREAM]') { | ||
if (line.match(/^\[stream/i)) { | ||
var stream = parseBlock(); | ||
data.streams.push(stream); | ||
} else if (line === '[FORMAT]') { | ||
} else if (line.toLowerCase() === '[format]') { | ||
data.format = parseBlock(); | ||
@@ -49,0 +52,0 @@ } |
@@ -631,3 +631,3 @@ /*jshint node:true*/ | ||
if (!this.ffmpegProc) { | ||
this.options.logger.warn('No running ffmpeg process, cannot send signal'); | ||
this.logger.warn('No running ffmpeg process, cannot send signal'); | ||
} else { | ||
@@ -634,0 +634,0 @@ this.ffmpegProc.kill(signal || 'SIGKILL'); |
@@ -179,4 +179,17 @@ /*jshint node:true*/ | ||
} else { | ||
var duration = Number(meta.format.duration); | ||
// Select video stream with the highest resolution | ||
var vstream = meta.streams.reduce(function(biggest, stream) { | ||
if (stream.codec_type === 'video' && stream.width * stream.height > biggest.width * biggest.height) { | ||
return stream; | ||
} else { | ||
return biggest; | ||
} | ||
}, { width: 0, height: 0 }); | ||
if (vstream.width === 0) { | ||
return next(new Error('No video stream in input, cannot take screenshots')); | ||
} | ||
var duration = Number(vstream.duration); | ||
if (isNaN(duration)) { | ||
@@ -206,3 +219,3 @@ return next(new Error('Could not get input duration, please specify fixed timemarks')); | ||
return utils.timemarkToSeconds(mark); | ||
}).sort(); | ||
}).sort(function(a, b) { return a - b; }); | ||
@@ -209,0 +222,0 @@ next(); |
{ | ||
"name": "fluent-ffmpeg", | ||
"version": "2.0.0-rc3", | ||
"version": "2.0.1", | ||
"description": "A fluent API to FFMPEG (http://www.ffmpeg.org)", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -7,7 +7,7 @@ # Fluent ffmpeg-API for node.js [](http://travis-ci.org/fluent-ffmpeg/node-fluent-ffmpeg) | ||
> | ||
> A major 2.0 release is coming soon. This release will feature lots of API cleanup and a cleaner syntax for most methods. | ||
> A major 2.0 version has been released. This release features lots of API cleanup and a cleaner syntax for most methods. | ||
> | ||
> It has been designed to be mostly compatible with current fluent-ffmpeg version, but there are some incompatibilities, mainly because deprecated APIs in 1.x have been removed. See [the 2.x migration wiki page](https://github.com/fluent-ffmpeg/node-fluent-ffmpeg/wiki/Migrating-from-fluent-ffmpeg-1.x) for information on how to migrate. | ||
> It has been designed to be mostly compatible with the previous fluent-ffmpeg version, but there are some incompatibilities, mainly because deprecated APIs in 1.x have been removed. See [the 2.x migration wiki page](https://github.com/fluent-ffmpeg/node-fluent-ffmpeg/wiki/Migrating-from-fluent-ffmpeg-1.x) for information on how to migrate. | ||
> | ||
> A release candidate version (2.0.0-rc3) is currently available on npm, please take care to update your package.json files if you want to keep using version 1.x: | ||
> Please take care to update your package.json files if you want to keep using version 1.x: | ||
> ```js | ||
@@ -997,4 +997,10 @@ { | ||
Use the `screenshots` method to extract one or several thumbnails and save them as PNG files. The `options` argument is an object with the following keys: | ||
Use the `screenshots` method to extract one or several thumbnails and save them as PNG files. There are a few caveats with this implementation, though: | ||
* It will not work on input streams. | ||
* Progress information reported by the `progress` event is not accurate. | ||
* It doesn't interract well with filters. In particular, don't use the `size()` method to resize thumbnails, use the `size` option instead. | ||
The `options` argument is an object with the following keys: | ||
* `folder`: output folder for generated image files. Defaults to the current folder. | ||
@@ -1121,3 +1127,3 @@ * `filename`: output filename pattern (see below). Defaults to "tn.png". | ||
The returned object is the same that is returned by running the following command from your shell: | ||
The returned object is the same that is returned by running the following command from your shell (depending on your ffmpeg version you may have to replace `-of` with `-print_format`) : | ||
@@ -1124,0 +1130,0 @@ ```sh |
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
967838
8694
1
1483