rest-ftp-daemon-transform-ffmpeg 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f4269d7d46e947e9cc141d6c0988c1d3185954
-  data.tar.gz: 485bf8cdbbe18a745dcb624455f2142e9cabcf00
+  metadata.gz: 2dffc5dcf1973509a1fcfbf3b16bdd47ba3835fe
+  data.tar.gz: 158d345fbb478cdcc22bae545577c37e34d24cc4
 SHA512:
-  metadata.gz: 1ad1e01d42c35a5f2e2b3668d30f8ad36dbd8424397dedc17d2bfdd291a13f6a8ea27022eef9e799aaee091eff7175ecc83b97085b056c0ded915c3ba82c23a8
-  data.tar.gz: ef78ee8f0a4f0a5d1ec2545406284509dba29fc341c8cfd5f0d9ce3f30bc30dcf71e0800d798217428f8d3f3ad17604e043fb77a49c7cd154704c7cf1fcfd6a6
+  metadata.gz: 9ce42d8a767ce6641b5c23a4e3892ba14a46387e944a4c46014ecdfee3ffc731ec5bead3e4fd7020757efa5b0bdeccd50be9b1f27f6c7238fa6de76fca34866e
+  data.tar.gz: 22ebcf8b166386e8d9b8cfbe8bd113beda6d78491c6e38a2630caf489f16832a0fed6cff00b871b6c9da6d5663284c924e6ff325ea87407dacf6cbb78dd2deee

data/lib/plugins/rest-ftp-daemon/transform/transform_ffmpeg.rb

@@ -1,7 +1,9 @@
 require 'streamio-ffmpeg'
 
 module RestFtpDaemon::Transform
-  class TransformFfmpeg < TaskTransform
+  class TransformFfmpeg < TransformBase
+    FFMPEG_THREADS      = 2
+    FFMPEG_ATTRIBUTES   = [:video_codec, :video_bitrate, :video_bitrate_tolerance, :frame_rate, :resolution, :aspect, :keyframe_interval, :x264_vprofile, :x264_preset, :audio_codec, :audio_bitrate, :audio_sample_rate, :audio_channels]
 
     # Task attributes
     def task_icon
@@ -9,12 +11,17 @@ module RestFtpDaemon::Transform
     end
 
     # Task operations
-    def prepare
+    def prepare stash
+      # Init
       super
+      @command = @config[:command]
+
+      # Ensure command is available
+      raise Task::TransformMissingBinary, "mp4split binary not defined" unless @command
 
       # Import command path
-      FFMPEG.ffmpeg_binary = @config[:ffmpeg]
-      FFMPEG.ffprobe_binary = File.join(File.dirname(@config[:ffmpeg]), "ffprobe")
+      FFMPEG.ffmpeg_binary = @config[:command]
+      FFMPEG.ffprobe_binary = File.join(File.dirname(@config[:command]), "ffprobe")
       log_debug "FFMPEG binaries", {
         ffmpeg_binary: FFMPEG.ffmpeg_binary,
         ffprobe_binary: FFMPEG.ffprobe_binary,
@@ -25,20 +32,19 @@ module RestFtpDaemon::Transform
       ffmpeg_check_binary :ffmpeg_binary
 
       # FIXME: only one source, otherwise  we don't know how to determine target name
-      if @input.count>1
-        raise Task::SourceShouldBeUnique, "prepare: only one source can be matched for transformation"
+      if stash.count>1
+        raise RestFtpDaemon::SourceShouldBeUnique, "prepare: only one source can be matched for transformation"
       end
     end
 
-    def process
-      transform_each_input
+    def process stash
+      transform_each_input stash
     end
 
   protected
 
-    def transform input, output
+    def transform name, input, output
       # Read info about source file
-      set_info INFO_CURRENT, output.name
       begin
         movie = FFMPEG::Movie.new(input.path_abs)
       rescue Errno::ENOENT => exception
@@ -54,16 +60,16 @@ module RestFtpDaemon::Transform
 
       # Build options
       ffmpeg_options = {}
-      JOB_FFMPEG_ATTRIBUTES.each do |name|
+      FFMPEG_ATTRIBUTES.each do |name|
         # Skip if no value
         key = name.to_s
         next if @options[key].nil?
 
-        # Grab this optin and value frop @options
+        # Grab this option and value frop @options
         ffmpeg_options[key]     = @options.delete(name)
       end
       ffmpeg_options[:custom]   = ffmpeg_options_from(@options[:custom])
-      ffmpeg_options[:threads]  = JOB_FFMPEG_THREADS
+      ffmpeg_options[:threads]  = FFMPEG_THREADS
       set_info :ffmpeg_options, ffmpeg_options
 
       # Build transcoder options
@@ -104,7 +110,7 @@ module RestFtpDaemon::Transform
       raise StandardError unless path && File.exist?(path)
 
     rescue StandardError, Errno::ENOENT => exception
-      raise Task::TransformMissingBinary, "missing ffmpeg binary: #{method}"
+      raise Transform::TransformMissingBinary, "missing ffmpeg binary: #{method}"
     end
 
   end

data/rest-ftp-daemon-transform-ffmpeg.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.0.6"
+  spec.version                    = "0.0.7"
 
   # Project description
   spec.name                       = "rest-ftp-daemon-transform-ffmpeg"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon-transform-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg