@@ -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 @@ -118,11 +118,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? @@ -143,7 +151,7 @@ module RVideo # :nodoc: end end end - + def get_fit_to_width_resolution w = @options['width'] lib/rvideo/tools/abstract_tool.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 lib/rvideo/tools/ffmpeg.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 spec/units/abstract_tool_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 ### spec/units/ffmpeg_spec.rb f8e12f528c6fa1c995f90ad3fcfce1e94da5908f Kai Krakow kai@kaishome.de http://github.com/twinge/rvideo/commit/ffc32f136d0a402a16af8466474348c6031ca4ca ffc32f136d0a402a16af8466474348c6031ca4ca 2009-04-13T14:13:16-07:00 2009-04-09T03:02:50-07:00 Add deinterlace option to ffmpeg tool This new option is also covered by the spec tests. I did implement this for ffmpeg only because my software only uses ffmpeg. You are free to change this. ;-) 88b757e6cd3669ba4d27d8a2536fe4437b8e3837 Seth Thomas Rasmussen sethrasmussen@gmail.com