video_transcoding 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904cedcc3f672a942705af405ab944ed1fd8a69e
-  data.tar.gz: 682950abf5c67fa62680dacde2a065d1bd88d0c1
+  metadata.gz: c228704a28bdfc0fcc86e1bab03106c34c7b92cd
+  data.tar.gz: 6d86557aae17cce47fc0db4692d72bc0cc0ff8bf
 SHA512:
-  metadata.gz: 6b4f1c5c66d22a5af7b34977c9bacb390613ce50367bd851b7747410b9a7bd1141c6609fee6cf5ebcbdb20ca1b74a275f7d36bf43b3038f0b7118d6cd17c9540
-  data.tar.gz: 38668e7971abb556ef149a7838ed93620ff2f1460dd1341a2550bc7e39014d2fbd5fe2c325e661b716b9385b0206a876fb979dc76743a58d481a7793d6fa75dd
+  metadata.gz: 6230729bd71adb9bd9b7bfe85ce26d1528c32d23409fdecf1a75178a8e38307c52bffd7b0d35451402502723bd98cca34116f85005490e77ab36d8f91b96c7b2
+  data.tar.gz: cdaf3c5804952e883bc897e6462f851b34ff156c8fda5603ead93c299047363a00b2dc424b5e4167d8e44436a1270f8d54421f80dd3cfc4cd00818b2a6f1214c

data/bin/transcode-video

@@ -231,7 +231,6 @@ HERE
       @srt_offset                 = {}
       @abr_bitrate                = nil
       @vbr_quality                = nil
-      @cvbr_bitrate               = nil
       @encoder_options            = {}
       @disable_encoder_options    = []
       @handbrake_options          = {'encoder-preset' => 'medium', 'encoder-profile' => 'high'}
@@ -610,23 +609,14 @@ HERE
 
       opts.on '--abr ARG', Integer do |arg|
         @abr_bitrate = arg
-        @cvbr_bitrate = nil
         @vbr_quality = nil
       end
 
       opts.on '--vbr ARG', Float do |arg|
         @vbr_quality = arg
-        @cvbr_bitrate = nil
         @abr_bitrate = nil
       end
 
-      opts.on '--cvbr ARG', Integer do |arg|
-        Console.warn 'Using experimental option: --cvbr'
-        @cvbr_bitrate = arg
-        @abr_bitrate = nil
-        @vbr_quality = nil
-      end
-
       opts.on '-E', '--encoder-option ARG' do |arg|
         if arg =~ /^([a-z0-9][a-z0-9_-]+)=([^ :]+)$/
           @encoder_options[$1] = $2
@@ -816,32 +806,25 @@ HERE
           handbrake_options['encoder-level'] = 'auto'
         end
 
-        if @cvbr_bitrate.nil?
-          handbrake_options['quality'] = '16'
+        handbrake_options['quality'] = '16'
 
-          unless media.info[:directory]
-            bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
+        unless media.info[:directory]
+          bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
 
-            if bitrate < vbv_maxrate
-              min_bitrate = vbv_maxrate / 2
+          if bitrate < vbv_maxrate
+            min_bitrate = vbv_maxrate / 2
 
-              if bitrate < min_bitrate
-                vbv_maxrate = min_bitrate
-              else
-                vbv_maxrate = bitrate
-              end
+            if bitrate < min_bitrate
+              vbv_maxrate = min_bitrate
+            else
+              vbv_maxrate = bitrate
             end
           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'
-        else
-          handbrake_options['quality']    = '1'
-          encoder_options['vbv-maxrate']  = @cvbr_bitrate.to_s
-          encoder_options['vbv-bufsize']  = (@cvbr_bitrate / 2).to_s
-          encoder_options['crf-max']      = '30'
         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'
       else
         unless @abr_bitrate.nil?
           handbrake_options['vb'] = @abr_bitrate.to_s

data/lib/video_transcoding/ffmpeg.rb

@@ -14,18 +14,13 @@ module VideoTranscoding
       Tool.provide(COMMAND_NAME, ['-version']) do |output, status, properties|
         fail "#{COMMAND_NAME} failed during execution" unless status == 0
 
-        unless output =~ /^ffmpeg version ([0-9.]+)/
+        unless output =~ /^ffmpeg version [^ ]+/
           Console.debug output
           fail "#{COMMAND_NAME} version unknown"
         end
 
-        version = $1
         Console.info "#{$MATCH} found..."
 
-        unless version =~ /^([0-9]+)\.([0-9]+)/ and (($1.to_i * 100) + $2.to_i) >= 205
-          fail "#{COMMAND_NAME} version 2.5.0 or later required"
-        end
-
         if output =~ /--enable-libfdk-aac/
           properties[:aac_encoder] = 'libfdk_aac'
         elsif output =~ /--enable-libfaac/

data/lib/video_transcoding/mplayer.rb

@@ -12,18 +12,12 @@ module VideoTranscoding
 
     def setup
       Tool.provide(COMMAND_NAME, ['-version']) do |output, _, _|
-        unless output =~ /^MPlayer .*-([0-9]+)\.([0-9]+)(?:\.[0-9]+)? /
+        unless output =~ /^MPlayer [^ ]+/
           Console.debug output
           fail "#{COMMAND_NAME} version unknown"
         end
 
-        major_version = $1.to_i
-        minor_version = $2.to_i
-        Console.info "#{$MATCH}found..."
-
-        unless ((major_version * 100) + minor_version) >= 402
-          fail "#{COMMAND_NAME} version 4.2 or later required"
-        end
+        Console.info "#{$MATCH} found..."
       end
     end
 

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

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