video_converter 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4fdb79738807817fb560768a6c96967624eac3c3
+  data.tar.gz: 61c4941087d486940d2c3420797c71d1f5aa8e83
+SHA512:
+  metadata.gz: 19e2a3ea041ca0d766d15748af7f7cd9f580e9b505766d25f7aa67380c483988afdac23a1d2a23979b0cc6a3265921d7d0962eca4fd9472e9171fddab15ed249
+  data.tar.gz: 7b01bdaefe59e061815d1ea818c5563fe43a420a9073ce49b6b021625cf13752f2638dad808fc098867206b964a8a45d3594253c68a4b5da258711eabf30f5d9

data/lib/video_converter/ffmpeg.rb

@@ -3,7 +3,7 @@
 module VideoConverter
   class Ffmpeg
     class << self
-      attr_accessor :aliases, :bin, :ffprobe_bin
+      attr_accessor :aliases, :defaults, :bin, :ffprobe_bin
       attr_accessor :one_pass_command, :first_pass_command, :second_pass_command, :keyframes_command, :split_command, :concat_command, :mux_command, :volume_detect_command, :crop_detect_command
     end
 
@@ -19,7 +19,20 @@ module VideoConverter
       :format => 'f',
       :bitstream_format => 'bsf',
       :pixel_format => 'pix_fmt',
-      :audio_filter => 'af'
+      :audio_filter => 'af',
+      :profile => 'vprofile'
+    }
+    self.defaults = { 
+      :threads => 1,
+      :video_codec => 'libx264',
+      :audio_codec => 'libfaac',
+      :pixel_format => 'yuv420p',
+      :frame_rate => 24,
+      :preset => 'medium',
+      :profile => 'main',
+      :level => 31,
+      :ar => 44100,
+      :ac => 2
     }
     self.bin = '/usr/local/bin/ffmpeg'
     self.ffprobe_bin = '/usr/local/bin/ffprobe'
@@ -105,12 +118,11 @@ module VideoConverter
         output.options[:format] ||= File.extname(output.filename).delete('.')
         output.options[:format] = 'mpegts' if output.options[:format] == 'ts'
         output.options[:movflags] = '+faststart' if output.faststart || (output.faststart.nil? && %w(mov mp4).include?(output.options[:format].downcase))
-        output.options = { 
-          :threads => 1, 
-          :video_codec => 'libx264', 
-          :audio_codec => 'libfaac', 
-          :pixel_format => 'yuv420p' 
-        }.merge(output.options) unless output.type == 'playlist'
+        unless output.type == 'playlist'
+          output.options = self.class.defaults.merge(output.options)
+          output.options[:keyint_min] ||= output.options[:frame_rate]
+          output.options[:keyframe_interval] = output.options[:keyint_min] * Output.keyframe_interval_in_seconds
+        end
       end
     end
 
@@ -125,8 +137,6 @@ module VideoConverter
         if !one_pass?(qualities) && common_first_pass?(qualities)
           qualities.each do |output| 
             output.options[:passlogfile] = File.join(output.work_dir, "group#{group_index}.log")
-            output.options[:keyint_min] = 25
-            output.options[:keyframe_interval] = 100
           end
           best_quality = qualities.sort do |q1, q2|
             res = q1.options[:video_bitrate].to_i <=> q2.options[:video_bitrate].to_i
@@ -146,6 +156,7 @@ module VideoConverter
           else
             output.options[:passlogfile] = File.join(output.work_dir, "group#{group_index}_#{output_index}.log")
             output.options[:force_key_frames] = input.metadata[:video_start_time].step(input.metadata[:duration_in_ms] / 1000.0, Output.keyframe_interval_in_seconds).map(&:floor).join(',')
+            output.options[:keyint_min], output.options[:keyframe_interval] = output.options[:keyframe_interval], nil
             Command.chain(self.class.first_pass_command, self.class.second_pass_command)
           end
 

data/lib/video_converter/output.rb

@@ -7,6 +7,7 @@ module VideoConverter
     end
     self.work_dir = '/tmp'
     self.log = 'converter.log'
+    # XXX move default options to one place
     self.keyframe_interval_in_seconds = 4
 
     attr_accessor :chunks_dir, :crop, :drm, :faststart, :ffmpeg_output, :filename, :group, :height, :log, :mkdir_mode, :no_fragments, :one_pass, :options, :path, :rotate, :streams, :thumbnails, :type, :uid, :volume, :watermarks, :width, :work_dir, :encryption_key, :encryption_key_url

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem allows you to convert video files using ffmpeg, mencoder and
@@ -99,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .Rakefile.swp
-- .gitignore
+- ".Rakefile.swp"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,35 +120,28 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -163534295853469513
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -163534295853469513
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ffmpeg, mencoder based converter to mp4, m3u8
 test_files:
 - test/fixtures/chunk0.ts