kakra-rvideo 0.9.6.2 → 0.9.6.3

data/lib/rvideo/tools/abstract_tool.rb

@@ -33,7 +33,7 @@ module RVideo # :nodoc:
           end
         end
     
-        abstract_attribute_formatter :resolution, :fps,
+        abstract_attribute_formatter :resolution, :deinterlace, :fps,
           :video_bit_rate, :video_bit_rate_tolerance,
           :video_bit_rate_min, :video_bit_rate_max,
           :audio_channels, :audio_bit_rate, :audio_sample_rate
@@ -131,11 +131,19 @@ module RVideo # :nodoc:
     
         ###
         # Resolution
-    
+
+        def deinterlace
+          format_deinterlace(get_deinterlace)
+        end
+
+        def get_deinterlace
+          { :deinterlace => @options['deinterlace'] ? true : false }
+        end
+
         def resolution
           format_resolution(get_resolution)
         end
-    
+
         def get_resolution
           inspect_original if @original.nil?
       
@@ -156,7 +164,7 @@ module RVideo # :nodoc:
             end
           end
         end
-    
+
         def get_fit_to_width_resolution
           w = @options['width']
       

data/lib/rvideo/tools/ffmpeg.rb

@@ -51,6 +51,10 @@ module RVideo
         'ffmpeg'
       end
       
+      def format_deinterlace(params={})
+        params[:deinterlace] ? "-deinterlace" : ""
+      end
+
       def format_fps(params={})
         "-r #{params[:fps]}"
       end

data/rvideo.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvideo}
-  s.version = "0.9.6.2"
+  s.version = "0.9.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling, Jonathan Dahl (Slantwise Design), Seth Thomas Rasmussen, Kai Krakow"]

data/spec/fixtures/recipes.yml

@@ -1,6 +1,6 @@
 simple_flv: |
   ffmpeg -i $input_file$ -ar 22050 -ab 64 -f flv -r 29.97 -s $resolution$ -y $temp_file$
-  flvtool2 -U $temp_file$ $output_file$
+#  flvtool2 -U $temp_file$ $output_file$
 simple_avi: |
   ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec mp3 -r 29.97 -s $resolution$ -y $output_file$
 
@@ -39,13 +39,13 @@ flash_700:
   command: |
     ffmpeg -y -i $input_file$ -f flv -b 700k -ab 80k -acodec libmp3lame -r 15 -ar 22050 -ac 2 -psnr -pass 1 -passlogfile $output_file$.log -s 480x360 $output_file$
     ffmpeg -y -i $input_file$ -f flv -b 700k -ab 80k -acodec libmp3lame -r 15 -ar 22050 -ac 2 -psnr -pass 2 -passlogfile $output_file$.log -s 480x360 $output_file$
-    flvtool2 -U $output_file$
+#    flvtool2 -U $output_file$
 flash_300:
   extension: 'flv'
   command: |
     ffmpeg -y -i $input_file$ -f flv -b 300k -ab 64k -acodec libmp3lame -r 15 -ar 22050 -ac 2 -psnr -pass 1 -passlogfile $output_file$.log -s 320x240 $output_file$
     ffmpeg -y -i $input_file$ -f flv -b 300k -ab 64k -acodec libmp3lame -r 15 -ar 22050 -ac 2 -psnr -pass 2 -passlogfile $output_file$.log -s 320x240 $output_file$
-    flvtool2 -U $output_file$
+#    flvtool2 -U $output_file$
 qt_500:
   extension: 'mov'
   command: |

data/spec/units/abstract_tool_spec.rb

@@ -81,13 +81,13 @@ module RVideo
         }.should raise_error(TranscoderError::ParameterError)
       end
       
-      it "the should raise an error when a recipe includes a variable not supplied (2)" do
+      it "should raise an error when a recipe includes a variable not supplied (2)" do
         lambda {
           ffmpeg = Ffmpeg.new(@simple_avi + " $novar$", @options)
         }.should raise_error(TranscoderError::ParameterError)
       end
       
-      it "the should not raise an error when a variable is supplied but nil" do
+      it "should not raise an error when a variable is supplied but nil" do
         ffmpeg = Ffmpeg.new(@simple_avi, @options.merge(:resolution => nil))
         ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec mp3 -r 29.97 -y '#{@options[:output_file]}'"
       end

data/spec/units/ffmpeg_spec.rb

@@ -111,6 +111,18 @@ module RVideo
         ffmpeg = Ffmpeg.new("ffmpeg -i $input_file$ $video_bit_rate$ $video_bit_rate_min$ $video_bit_rate_max$ -y $output_file$", @options)
         ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -b 666k -minrate 666k -maxrate 666k -y '#{@options[:output_file]}'"
       end
+
+      it "supports :deinterlace => true" do
+        @options.merge! :deinterlace => true
+        ffmpeg = Ffmpeg.new("ffmpeg -i $input_file$ $deinterlace$ -y $output_file$", @options)
+        ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -deinterlace -y '#{@options[:output_file]}'"
+      end
+
+      it "handles :deinterlace => false correct" do
+        @options.merge! :deinterlace => false
+        ffmpeg = Ffmpeg.new("ffmpeg -i $input_file$ $deinterlace$ -y $output_file$", @options)
+        ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}'  -y '#{@options[:output_file]}'"
+      end
       
       ###
       
@@ -155,22 +167,20 @@ module RVideo
         ffmpeg = Ffmpeg.new("ffmpeg -i $input_file$ $video_quality$ -y $output_file$", @options)
         ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -b 666k -crf 18 -flags +loop -cmp +sad -partitions +parti4x4+partp8x8+partb8x8 -flags2 +mixed_refs -me full -subq 6 -trellis 1 -refs 3 -bf 3 -b_strategy 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -y '#{@options[:output_file]}'"
       end
-      
-      # These appear unsupported..
-      # 
-      # it 'should support passthrough height' do
-      #   options = {:input_file => spec_file("kites.mp4"), :output_file => "bar", :width => "640"}
-      #   command = "ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 $resolution$ -y $output_file$"
-      #   ffmpeg = Ffmpeg.new(command, options)
-      #   ffmpeg.command.should == "ffmpeg -i '#{options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 640x720 -y 'bar'"        
-      # end
-      # 
-      # it 'should support passthrough width' do
-      #   options = {:input_file => spec_file("kites.mp4"), :output_file => "bar", :height => "360"}
-      #   command = "ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 $resolution$ -y $output_file$"
-      #   ffmpeg = Ffmpeg.new(command, options)
-      #   ffmpeg.command.should == "ffmpeg -i '#{options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 1280x360 -y 'bar'"        
-      # end
+
+      it "should support passthrough scaled and rounded height" do
+        options = {:input_file => spec_file("kites.mp4"), :output_file => "bar", :width => "640"}
+        command = "ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 $resolution$ -y $output_file$"
+        ffmpeg = Ffmpeg.new(command, options)
+        ffmpeg.command.should == "ffmpeg -i '#{options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 640x528 -y 'bar'"
+      end
+
+      it "should support passthrough scaled and rounded width" do
+        options = {:input_file => spec_file("kites.mp4"), :output_file => "bar", :height => "360"}
+        command = "ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 $resolution$ -y $output_file$"
+        ffmpeg = Ffmpeg.new(command, options)
+        ffmpeg.command.should == "ffmpeg -i '#{options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 448x360 -y 'bar'"
+      end
     end
     
     describe Ffmpeg, " when parsing a result" do
@@ -250,7 +260,7 @@ module RVideo
     end
     
     context Ffmpeg, "result parsing should raise an exception" do
-      setup do
+      before do
         setup_ffmpeg_spec
         @results = load_fixture :ffmpeg_results
       end

data/spec/units/flvtool2_spec.rb

@@ -51,7 +51,7 @@ module RVideo
     
     context Flvtool2, " result parsing should raise an exception" do
       
-      setup do
+      before do
         setup_flvtool2_spec
       end
       
@@ -321,4 +321,4 @@ def setup_flvtool2_spec
     hasCuePoints: false
     width: 320
   ..."
-end
+end

data/spec/units/frame_capturer_spec.rb

@@ -15,7 +15,7 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
   end
   
   it "should calculate a timecode, when given a frame" do
-    @file.inspector.fps.should == "10"
+    @file.inspector.fps.should == "10.00"
     @file.calculate_time("10f").should be_close(1.0, 0.1)
     @file.calculate_time("27.6f").should be_close(2.76, 0.1)
     
@@ -69,4 +69,4 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
       f.command
   end
 end
-end
+end

data/spec/units/mencoder_spec.rb

@@ -46,7 +46,7 @@ module RVideo
     
     context Mencoder, " result parsing should raise an exception" do
       
-      setup do
+      before do
         setup_mencoder_spec
       end
       
@@ -4991,4 +4991,4 @@ def setup_mencoder_spec
   Video stream:  413.233 kbit/s  (51654 B/s)  size: 8350481 bytes  161.661 secs  2429 frames
 
   Audio stream:   63.831 kbit/s  (7978 B/s)  size: 1291598 bytes  161.877 secs"
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kakra-rvideo
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.2
+  version: 0.9.6.3
 platform: ruby
 authors: 
 - Peter Boling, Jonathan Dahl (Slantwise Design), Seth Thomas Rasmussen, Kai Krakow