resolve conflicts

Author: brain64bit

CHANGELOG.markdown

@@ -1,3 +1,12 @@
+## codem-transcode 0.5.10 (2015/09/16) ##
+
+* Increase maxBuffer to 4MB to compensate for older ffmpegs
+
+## codem-transcode 0.5.9 (2015/09/03) ##
+
+* Fix for lingering "processing" jobs. (#42)
+* Encoder options can be an array instead of a string as well (to allow complex filters)
+
 ## codem-transcode 0.5.8 (2015/07/05) ##
 
 * Prevent transcoder from returning a negative freeSlot count (@larsfi).

README.markdown

@@ -166,8 +166,10 @@ The `thumbnail_options` object is optional and contains a set of thumbnails that
 
 If you specify thumbnails but an error occurs during generation, your job will be marked as failed. If you don't specify a valid `seconds` or `percentages` option thumbnail generation will be skipped but the job can still be completed successfully.
 
+### Segmenting / HLS
+
 The `segments_options` object is optional and contains segment time (duration) in seconds. Segmented videos are used in [HLS](https://en.wikipedia.org/wiki/HTTP_Live_Streaming). These options are applied to the encoded video, thus `encoder_options` are required. Moreover `encoder_options` should prepare video for segmenting, because bitstream
-filter [h264_mp4toannexb](https://www.ffmpeg.org/ffmpeg-bitstream-filters.html#h264_005fmp4toannexb) will be applied to the video. Therefore it is recommended to transcode to an MP4 file before segmenting.
+filter [h264_mp4toannexb](https://www.ffmpeg.org/ffmpeg-bitstream-filters.html#h264_005fmp4toannexb) will be applied to the video. Therefore it is recommended to transcode to an MP4 file before segmenting. Segmenting works by taking the output file from your transcoder job and applying segmenting to it.
 
 The segmenting command looks like:
 

lib/job.js

@@ -19,11 +19,11 @@ var StatusCodes = {
 
 var JobUtils = {
   sql: null,
-  
+
   generateThumbnailPath: function(destinationFile, offset, format) {
-    return [path.dirname(destinationFile), path.basename(destinationFile, path.extname(destinationFile))].join(path.sep) + "-" + offset + "." + format;    
+    return [path.dirname(destinationFile), path.basename(destinationFile, path.extname(destinationFile))].join(path.sep) + "-" + offset + "." + format;
   },
-  
+
   generateRangeFromThumbOpts: function(thumbOpts, duration) {
     if (thumbOpts['percentages']) {
       // percentage based thumbnails
@@ -35,7 +35,7 @@ var JobUtils = {
       return null;
     }
   },
-  
+
   getDatabase: function() {
     if (JobUtils.sql == null) {
       if (config['database']['dialect'] == "sqlite") {
@@ -50,8 +50,9 @@ var JobUtils = {
           storage: config['database']['database'],
           host: config['database']['host'],
           port: config['database']['port'],
-          logging: false,
           omitNull: true
+          pool: false,
+          logging: false
         });
       }
     }
@@ -74,7 +75,7 @@ var JobUtils = {
     });
     callback(null);
   },
-  
+
   migrateDatabase: function(callback) {
     var migrator = JobUtils.getDatabase().getMigrator({path: __dirname + "/../migrations" });
     migrator.migrate().success(function() {
@@ -83,14 +84,14 @@ var JobUtils = {
       callback(err);
     });
   },
-  
+
   pad: function(orig, padString, length) {
     var str = orig;
     while (str.length < length)
         str = padString + str;
     return str;
   },
-  
+
   percentagesToRange: function(percentages, duration) {
     if (Array.isArray(percentages)) {
       // explicit percentages
@@ -104,7 +105,7 @@ var JobUtils = {
       return offsets;
     }
   },
-  
+
   secondsToRange: function(seconds, duration) {
     if (Array.isArray(seconds)) {
       // explicit percentages
@@ -118,7 +119,7 @@ var JobUtils = {
       return offsets;
     }
   },
-  
+
   verifyDatabase: function(callback) {
     JobUtils.getDatabase().getQueryInterface().showAllTables().success(function (tables) {
       if (tables.length > 0 && tables.indexOf('SequelizeMeta') == -1) {
@@ -220,12 +221,12 @@ var Job = JobUtils.getDatabase().define('Job', {
         if (err) {
           fs.stat(destination_dir, function(err, stats) {
             if (err) {
-              job.exitHandler(-1, "unable to create output directory (" + destination_dir + ").");          
+              job.exitHandler(-1, "unable to create output directory (" + destination_dir + ").");
             } else {
               if (stats.isDirectory()) {
-                callback("hasOutputDir");            
+                callback("hasOutputDir");
               } else {
-                job.exitHandler(-1, "unable to create output directory (" + destination_dir + ").");                      
+                job.exitHandler(-1, "unable to create output directory (" + destination_dir + ").");
               }
             }
           });
@@ -265,8 +266,8 @@ var Job = JobUtils.getDatabase().define('Job', {
           var null_file = (!!os.platform().match(/^win/) ? 'nul' : '/dev/null');
           args.push('-f', 'null', '-acodec', 'copy', '-vcodec', 'copy', '-y', null_file);
         }
-        
-        var the_process = child_process.spawn(config['encoder'], args);          
+
+        var the_process = child_process.spawn(config['encoder'], args);
 
         the_process.stderr.on('data', function(data) { job.progressHandler(data); });
         the_process.on('error', function(err) { job.lastMessage = 'Unable to execute the ffmpeg binary: ' + err; job.didFinish(1); });
@@ -316,14 +317,14 @@ var Job = JobUtils.getDatabase().define('Job', {
       var playlistPath     = [playlistDir, playlistName].join(path.sep) + '.m3u8';
       var segmentsFormat   = [playlistDir, playlistName].join(path.sep) + '-%06d.ts'
       var inputFile        = (this.parsedOpts()['encoder_options'].length > 0) ? job.tmpFile : this.parsedOpts()['source_file']
-      
+
       args.push('-i', inputFile,
                 '-codec', 'copy', '-map', '0', '-f', 'segment',
                 '-vbsf', 'h264_mp4toannexb', '-flags', '-global_header',
                 '-segment_format', 'mpegts', '-segment_list', playlistPath,
                 '-segment_time', segmentTime, segmentsFormat);
 
-      child_process.execFile(config['encoder'], args, function(error, stdout, stderr) {
+      child_process.execFile(config['encoder'], args, { maxBuffer: 4096*1024 }, function(error, stdout, stderr) {
         if (error) {
           job.lastMessage = 'Error while generating segments: ' + error.message;
           callbacks.error(job);
@@ -386,20 +387,20 @@ var Job = JobUtils.getDatabase().define('Job', {
       return function(callback) {
         var thumbOpts = job.parsedOpts()['thumbnail_options'];
         var args = ['-ss', offset, '-i', job.parsedOpts()['source_file'], '-vframes', '1', '-y'];
-        
+
         // Explicit size provided
         if (thumbOpts['size'] && thumbOpts['size'] != 'src') {
           args.push('-s', thumbOpts['size']);
         }
 
         var format = thumbOpts['format'] ? thumbOpts['format'] : 'jpg';
         var destinationFile = job.parsedOpts()['destination_file'];
-        
+
         // Destination file + offset + extension
         var outputFile = JobUtils.generateThumbnailPath(destinationFile, offset, format);
         args.push(outputFile);
-        
-        var thumb_process = child_process.execFile(config['encoder'], args, function(error, stdout, stderr) {
+
+        var thumb_process = child_process.execFile(config['encoder'], args, { maxBuffer: 4096*1024 }, function(error, stdout, stderr) {
           if (error) {
             callback(new Error('Error while generating thumbnail: ' + error.message), null);
           } else {
@@ -473,6 +474,8 @@ var Job = JobUtils.getDatabase().define('Job', {
       return obj;
     },
     progressHandler: function(data) {
+      if (this.hasExited) return;
+
       this.lastMessage = data.toString().replace("\n",'');
 
       (isNaN(this.duration) || this.duration == 0) ? this.extractDuration(data.toString()) : this.extractProgress(data.toString());
@@ -495,11 +498,11 @@ var Job = JobUtils.getDatabase().define('Job', {
 
         this.duration = hours * 3600 + minutes * 60 + seconds;
         notifyHandler.notify(this);
-      }    
+      }
     },
     extractProgress: function(text) {
       // 00:00:00 (hours, minutes, seconds)
-      var re = new RegExp(/time=(\d{2}):(\d{2}):(\d{2})/);    
+      var re = new RegExp(/time=(\d{2}):(\d{2}):(\d{2})/);
       var m = re.exec(text);
 
       if (m != null) {
@@ -508,7 +511,7 @@ var Job = JobUtils.getDatabase().define('Job', {
         this.progress = current / this.duration;
       } else {
         // 00.00 (seconds, hundreds)
-        re = new RegExp(/time=(\d+).(\d{2})/);    
+        re = new RegExp(/time=(\d+).(\d{2})/);
         m = re.exec(text);
 
         if (m != null) {
@@ -518,18 +521,21 @@ var Job = JobUtils.getDatabase().define('Job', {
       }
     },
     exitHandler: function(code, message) {
-      if (!this.hasExited) {
-        this.hasExited = true
-        this.status = (code == 0 ? 'success' : 'failed');
-        this.message = message;
-
-        if (this.status == 'success' && !isNaN(this.progress)) {
-          this.progress = 1.0;
-        }
+      this.hasExited = true
+      this.message = message;
 
-        this.save();
-        this.completeCallback();
+      if (code == 0) {
+        this.progress = 1.0;
       }
+
+      this.status = (code == 0 ? StatusCodes.SUCCESS : StatusCodes.FAILED);
+      this.save().success(function() {
+        // successfull save
+      }).error(function(err) {
+        // error while saving job
+        logger.log("Error while saving job: " + err)
+      });
+      this.completeCallback();
     }
   }
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codem-transcode",
   "description": "Offline video transcoding using ffmpeg, with a small HTTP API.",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "keywords": ["transcoding", "ffmpeg", "video"],
   "homepage": "http://www.transcodem.com/",
   "repository": {