video_converter 0.8.0 → 0.8.1

data/lib/video_converter/ffmpeg.rb

@@ -31,7 +31,7 @@ module VideoConverter
     self.split_command = '%{bin} -fflags +genpts -i %{input} %{options} %{output} 1>>%{log} 2>&1 || exit 1'
     self.concat_command = "%{bin} -f concat -i %{input} %{options} %{output} 1>>%{log} 2>&1 || exit 1"
     self.mux_command = "%{bin} %{inputs} %{maps} %{options} %{output} 1>>%{log} 2>&1 || exit 1"
-    self.volume_detect_command = "%{bin} -i %{input} -af volumedetect -f null - 2>&1"
+    self.volume_detect_command = "%{bin} -i %{input} -af volumedetect -c:v copy -f null - 2>&1"
 
     def self.split(input, output)
       output.options = { :format => 'segment', :map => 0, :codec => 'copy' }.merge(output.options)
@@ -71,12 +71,14 @@ module VideoConverter
         filter_complex = [output.options[:filter_complex]].compact
         filter_complex << "crop=#{output.crop}" if output.crop
         if output.width || output.height
-          video_stream = input.metadata[:video_streams].first
-          width, height = (video_stream[:dar_width] || video_stream[:width]).to_f, (video_stream[:dar_height] || video_stream[:height]).to_f
-          output.width = (output.height * width / height / 2).to_i * 2 if output.height && !output.width
-          output.height = (output.width * height / width / 2).to_i * 2 if output.width && !output.height
+          output.width = (output.height * aspect(input, output)).ceil / 2 * 2 if output.height && !output.width
+          output.height = (output.width / aspect(input, output)).ceil / 2 * 2 if output.width && !output.height
           filter_complex << "scale=#{scale(output.width, :w)}:#{scale(output.height, :h)}"
-          filter_complex << "setdar=#{video_stream[:dar_width]}:#{video_stream[:dar_height]}" if video_stream[:dar_width] && video_stream[:dar_height]
+          if output.options[:aspect]
+            filter_complex << "setdar=#{output.options.delete(:aspect)}"
+          elsif input.video_stream[:dar_width] && input.video_stream[:dar_height]
+            filter_complex << "setdar=#{input.video_stream[:dar_width]}:#{input.video_stream[:dar_height]}"
+          end
         end
         if output.watermarks && (output.watermarks[:width] || output.watermarks[:height])
           filter_complex = ["[0:v] #{filter_complex.join(',')} [main]"]
@@ -222,5 +224,17 @@ module VideoConverter
         level
       end
     end
+
+    def aspect(input, output)
+      if aspect = output.options[:aspect]
+        if matches = aspect.to_s.match(/^(\d+):(\d+)$/)
+          matches[1].to_f / matches[2].to_f
+        else
+          Float(aspect)
+        end
+      else
+        (input.video_stream[:dar_width] || input.video_stream[:width]).to_f / (input.video_stream[:dar_height] || input.video_stream[:height]).to_f
+      end
+    end
   end
 end

data/lib/video_converter/input.rb

@@ -66,6 +66,10 @@ module VideoConverter
       @metadata
     end
 
+    def video_stream
+      metadata[:video_streams].first
+    end
+
     def mean_volume
       @mean_volume ||= Command.new(Ffmpeg.volume_detect_command, :bin => Ffmpeg.bin, :input => input).capture.match(/mean_volume:\s([-\d.]+)\sdB/).to_a[1]
     end

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/test/video_converter_test.rb

@@ -25,6 +25,42 @@ class VideoConverterTest < Test::Unit::TestCase
         assert_equal %w(. .. scr004.jpg scr004_norm.jpg scr005.jpg scr005_norm.jpg).sort, Dir.entries(File.join(@c.outputs.first.work_dir, 'thumbnails')).sort
       end
     end
+
+    context 'with aspect' do
+      setup do
+        (@c = VideoConverter.new(
+          :input => 'test/fixtures/test (1).mp4', 
+          :outputs => [
+            { :video_bitrate => 300, :filename => 'res.mp4', :aspect => '4:3' }, 
+          ]
+        )).run
+      end
+
+      should 'change aspect' do
+        m = VideoConverter.new(:input => @c.outputs.first.ffmpeg_output).inputs.first.video_stream
+        assert_equal 4, m[:dar_width].to_i
+        assert_equal 3, m[:dar_height].to_i
+      end
+    end
+
+    context 'with aspect and resize' do
+      setup do
+        (@c = VideoConverter.new(
+          :input => 'test/fixtures/test (1).mp4', 
+          :outputs => [
+            { :video_bitrate => 300, :filename => 'res.mp4', :aspect => '4:3', :height => 240 }, 
+          ]
+        )).run
+      end
+
+      should 'change aspect and resolution' do
+        m = VideoConverter.new(:input => @c.outputs.first.ffmpeg_output).inputs.first.video_stream
+        assert_equal 4, m[:dar_width].to_i
+        assert_equal 3, m[:dar_height].to_i
+        assert_equal 320, m[:width].to_i
+        assert_equal 240, m[:height].to_i
+      end
+    end
   end
 
   context 'segmentation' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2160906061662950076
+      hash: -2686683982963894083
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2160906061662950076
+      hash: -2686683982963894083
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls