video_transcoding 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7d919e24a5fca251194f942cda740d77abbad8
-  data.tar.gz: c083259606760eeddfb2696bbf804ba28c7b3a07
+  metadata.gz: 1091a510ba22d9f6993cbf6d771543a0ac6186c8
+  data.tar.gz: 54b715df7da3d45652cd61616c38baa27439fa58
 SHA512:
-  metadata.gz: f8bf3c064537725ee6c6c89b0e570a21366adb3c4957dc10296a2d9915dd62c079cb8ce286333e35deb5654273ac5faabcd9361e81d203614f03fbf69771cd56
-  data.tar.gz: 663b007581e46bca80e38036864bc20cdda665219da8f73d45a5ef0407b7b8e5bcbad51c5084ffb3a9efa7bf9c1293a0143af36ca3d183f07539ee96eda52abc
+  metadata.gz: f8d958cd7f52b285858f6ec472bd30ed56ba56f6f075f6445cb280a69abac6e6febfa5a173e25cba0fc0abb3c251e91bcfa15d4a925ea67f4ebce89873738dd4
+  data.tar.gz: bcba09ac273d476e03b4d7d5196511a3e38d0fba14bf7cbe215d0c978861a6da7b21cb25e81837445aa256eda9082448c3d894647089ee2cc96fbc06ca480724

data/bin/transcode-video

@@ -234,7 +234,7 @@ HERE
       @vbr_quality                = nil
       @encoder_options            = {}
       @disable_encoder_options    = []
-      @handbrake_options          = {}
+      @handbrake_options          = {'encoder-preset' => 'medium', 'encoder-profile' => 'high'}
       @disable_handbrake_options  = []
       @temporary                  = nil
     end
@@ -297,15 +297,13 @@ HERE
 
       opts.on '--quick' do
         @quick = true
-        @handbrake_options.delete 'encoder-preset'
+        force_handbrake_option 'encoder-preset', 'medium'
       end
 
       opts.on '--preset ARG' do |arg|
         case arg
-        when 'medium'
-          @handbrake_options.delete 'encoder-preset'
-        when 'ultrafast', 'superfast', 'veryfast', 'faster', 'fast', 'slow',
-        'slower', 'veryslow', 'placebo'
+        when 'ultrafast', 'superfast', 'veryfast', 'faster', 'fast', 'medium',
+        'slow', 'slower', 'veryslow', 'placebo'
           force_handbrake_option 'encoder-preset', arg
         else
           fail UsageError, "unsupported preset name: #{arg}"
@@ -604,10 +602,10 @@ HERE
       end
 
       opts.on '-E', '--encoder-option ARG' do |arg|
-        if arg =~ /^([a-z][a-z_-]+)=([^ :]+)$/
+        if arg =~ /^([a-z0-9][a-z0-9_-]+)=([^ :]+)$/
           @encoder_options[$1] = $2
           @disable_encoder_options.delete $1
-        elsif arg =~ /^_([a-z][a-z_-]+)$/
+        elsif arg =~ /^_([a-z0-9][a-z0-9_-]+)$/
           @disable_encoder_options << $1
           @encoder_options.delete $1
         else
@@ -770,25 +768,30 @@ HERE
 
       handbrake_options[anamorphic] = nil unless @handbrake_options.has_key? 'custom-anamorphic'
 
-      if @abr_bitrate.nil? and @vbr_quality.nil?
-        handbrake_options['quality'] = '16'
-        preset = @handbrake_options.fetch('encoder-preset', 'medium')
+      if width > 1920 or height > 1080
+        handbrake_options['encoder-level'] = '5.1'
+        vbv_maxrate = @vbv_maxrate_2160p
+      elsif width > 1280 or height > 720
+        handbrake_options['encoder-level'] = '4.0'
+        vbv_maxrate = @vbv_maxrate_1080p
+      elsif width > 720 or height > 576
+        handbrake_options['encoder-level'] = '3.1'
+        vbv_maxrate = @vbv_maxrate_720p
+      else
+        handbrake_options['encoder-level'] = '3.0'
+        vbv_maxrate = @vbv_maxrate_480p
+      end
 
-        if width > 1920 or height > 1080
-          vbv_maxrate = @vbv_maxrate_2160p
-        elsif width > 1280 or height > 720
-          vbv_maxrate = @vbv_maxrate_1080p
+      preset = @handbrake_options.fetch('encoder-preset', 'medium')
 
-          case preset
-          when 'slow', 'slower', 'veryslow', 'placebo'
-            handbrake_options['encoder-level'] = '4.0'
-          end
-        elsif width > 720 or height > 576
-          vbv_maxrate = @vbv_maxrate_720p
-        else
-          vbv_maxrate = @vbv_maxrate_480p
+      if @abr_bitrate.nil? and @vbr_quality.nil?
+        case preset
+        when 'ultrafast', 'superfast', 'veryfast', 'faster', 'fast', 'medium'
+          handbrake_options['encoder-level'] = 'auto'
         end
 
+        handbrake_options['quality'] = '16'
+
         unless media.info[:directory]
           bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
 
@@ -803,11 +806,6 @@ HERE
           end
         end
 
-        case preset
-        when 'slower', 'veryslow', 'placebo'
-          encoder_options['ref'] = '5'
-        end
-
         encoder_options['vbv-maxrate'] = vbv_maxrate.to_s
         encoder_options['vbv-bufsize'] = (@encoder_options.fetch('vbv-maxrate', vbv_maxrate).to_i / 2).to_s
         encoder_options['crf-max'] = '25'
@@ -818,19 +816,9 @@ HERE
         end
 
         handbrake_options['quality'] = @vbr_quality.to_s.gsub(/\.0+$/, '') unless @vbr_quality.nil?
-
-        if width > 1920 or height > 1080
-          handbrake_options['encoder-level'] = '5.1'
-        elsif width > 1280 or height > 720
-          handbrake_options['encoder-level'] = '4.0'
-        elsif width > 720 or height > 576
-          handbrake_options['encoder-level'] = '3.1'
-        else
-          handbrake_options['encoder-level'] = '3.0'
-        end
       end
 
-      if @quick and not @handbrake_options.has_key? 'encoder-preset'
+      if @quick and preset == 'medium'
         encoder_options['ref']          = '1'
         encoder_options['weightp']      = '1'
         encoder_options['subme']        = '6'
@@ -1082,7 +1070,7 @@ HERE
         else
           files     << file
           encodings << encoding
-          offsets   << offsets
+          offsets   << offset
           languages << language
         end
       end

data/lib/video_transcoding/handbrake.rb

@@ -24,6 +24,16 @@ module VideoTranscoding
           end
         end
       end
+
+      begin
+        IO.popen([Tool.use(COMMAND_NAME), '--version'], :err=>[:child, :out]) do |io|
+          if io.read =~ /^HandBrake ([^ ]+)/
+            Console.info "#{$MATCH.strip} found..."
+          end
+        end
+      rescue SystemCallError => e
+        raise "#{COMMAND_NAME} failed during execution: #{e}"
+      end
     end
 
     def command_name

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect