added custom ffmpeg

Sebastian Bean · Sebastian Bean · commit 249e58ec0a65 · 2012-12-04T09:24:16.000-05:00
diff --git a/lib/uploadhandler.js b/lib/uploadhandler.js
@@ -44,6 +44,10 @@ module.exports = function (options) {
                         size: stats.size
                     });
                     this.initUrls(fileInfo);
+
+                    if(options.videoTypes.test(name))
+                        fileInfo.is_video = true
+
                     files.push(fileInfo);
                 }
             }, this);
@@ -99,43 +103,37 @@ module.exports = function (options) {
                     var generatePreviews = function () {
 
                         if (options.videoTypes.test(fileInfo.name)) {
-                            var image_path = options.uploadDir() + '/' + path.basename(file.path) + '.png';
-                            console.log(image_path)
-                            break;
-                            var proc = new ffmpeg({
-                                // input source, required
-                                source: options.uploadDir() + '/' + fileInfo.name,
-                                // timout of the spawned ffmpeg sub-processes in seconds (optional, defaults to 30)
-                                timeout: 30,
-                                // default priority for all ffmpeg sub-processes (optional, defaults to 0 which is no priorization)
-                                priority: 0,
-                                // set a custom [winston](https://github.com/flatiron/winston) logging instance (optional, default null which will cause fluent-ffmpeg to spawn a winston console logger)
-                                logger: null,
-                                // completely disable logging (optional, defaults to false)
-                                nolog: false
-                            })  
-                            // .withSize('450x?')
-                            .addOption('-vframes', '1')
-                            .onProgress(function(progress) {
-                                // console.log(progress);
-                            })  
-                            .saveToFile(image_path, function(retcode, error) {
-                                console.log('file has been converted succesfully');
-                                _.each(options.imageVersions, function (value, version) {
-                                    // creating directory recursive
-                                    if (!fs.existsSync(options.uploadDir() + '/' + version + '/'))
-                                        mkdirp.sync(options.uploadDir() + '/' + version + '/');
-
-                                    counter++;
-                                    var opts = options.imageVersions[version];
-                                    imageMagick.resize({
-                                        width: opts.width,
-                                        height: opts.height,
-                                        srcPath: image_path,
-                                        dstPath: options.uploadDir() + '/' + version + '/' + fileInfo.name
-                                    }, finish);
-                                });
-                            })
+                            
+                            var video_path = options.uploadDir() + '/' + fileInfo.name
+                            
+
+
+                            _.each(options.imageVersions, function (opts, version) {
+                                // var version_dir = options.uploadDir() + '/' + version + '/';
+                                // creating directory recursive
+                                // if (!fs.existsSync(version_dir))
+                                //     mkdirp.sync(version_dir);
+
+                                counter++;
+
+                                console.log('video path '+ video_path);
+
+                                var proc = new ffmpeg({
+                                    // input source, required
+                                    source: video_path
+                                })  
+                                .withSize(opts.width + 'x?')
+                                .takeScreenshots({
+                                    count: 1,
+                                    timemarks: ['0'],
+                                    filename: '/%b'
+                                }, path.join(options.uploadDir(), version), function(err, filenames) {
+                                    console.log('files ' + filenames + ' error ' + err)
+                                    finish();
+                                })                  
+                            });                            
+
+
                         }
 
                         if (options.imageTypes.test(fileInfo.name)) {
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "imagemagick": ">=0.1.2",
     "lodash": ">= 0.9.2",
     "mkdirp": ">= 0.3.4",
-    "fluent-ffmpeg" : "latest"
+    "fluent-ffmpeg" : "git://github.com/sebbean/node-fluent-ffmpeg.git#master"
   },
   "engines": {
     "node": ">= 0.8.8"
