mhs-rvideo 0.9.4 → 0.9.6

data/History.txt

@@ -1,3 +1,23 @@
+== 0.9.6 2010-01-04 (forked, mhs release)
+
+* Updated RVideo::Inspect#capture_frame to raise RVideo::TranscoderError::OuptutFileNotFound error when ffmpeg fails to extract a screenshot from a given movie.
+
+* Updated inspector to support ffmpeg output from the macports ffmpeg.
+
+
+== 0.9.5 2008-09-09
+Note:
+* Moving hosting to GitHub.
+  http://github.com/zencoder/rvideo/tree
+
+2 major enhancements:
+* Large files, or some tools, would dump out so much output that it could run a server out of memory.
+  Changed the way that output is parsed.  Instead of pulling it all into memory, the log file is sent to 
+  disk, and then post-processed.
+* Added support for yamdi (http://yamdi.sourceforge.net/) for FLV metadata injection.  This is much faster 
+  than flvtool2 on huge files, and uses less memory as well.
+
+
 == 0.9.4 2007-12-12
 
 3 major enhancements:

data/README.txt

@@ -82,10 +82,10 @@ do.
 If RVideo is useful to you, you may also be interested in RMovie, another Ruby
 video library. See http://rmovie.rubyforge.org/ for more.
 
-Finally, watch for Spinoza, a commercial video transcoder built by Slantwise 
-Design. Spinoza uses RVideo for its video processing, but adds file queuing,  
+Finally, watch for Zencoder, a commercial video transcoder built by Slantwise 
+Design. Zencoder uses RVideo for its video processing, but adds file queuing,  
 distributed transcoding, a web-based transcoder dashboard, and more. See 
-http://spinoza.tv or http://slantwisedesign.com for more.
+http://zencoder.tv or http://slantwisedesign.com for more.
 
 Copyright (c) 2007 Jonathan Dahl and Slantwise Design. Released under the MIT 
 license.

data/lib/rvideo/errors.rb

@@ -9,6 +9,9 @@ module RVideo
     class InputFileNotFound < TranscoderError
     end
     
+    class OutputFileNotFound < TranscoderError
+    end
+    
     class UnexpectedResult < TranscoderError
     end
     

data/lib/rvideo/inspector.rb

@@ -161,6 +161,20 @@ module RVideo # :nodoc:
       command = "ffmpeg -i #{@full_filename} -ss #{t} -t 00:00:01 -r 1 -vframes 1 -f image2 #{output_file}"
       Transcoder.logger.info("\nCreating Screenshot: #{command}\n")
       frame_result = `#{command} 2>&1`
+      
+      # Different versions of ffmpeg report errors differently when a screenshot cannot be extracted from
+      # a video given its set of options. Some versions return a non-zero exit code and report errors while
+      # others simply
+      unless File.exists?(output_file)
+        msg = <<-EOT.gsub(/(^\s+|\n)/, '')
+          This means that ffmpeg could not extract a screenshot from the video. It may indicate that
+          the video file was corrupt or that the requested frame to be captured was outside the length
+          of the video. Full command: #{command}
+        EOT
+        Transcoder.logger.error msg
+        raise TranscoderError::OutputFileNotFound, msg
+      end
+      
       Transcoder.logger.info("\nScreenshot results: #{frame_result}")
       output_file
     end
@@ -322,7 +336,7 @@ module RVideo # :nodoc:
       bitrate_match[2]
     end
     
-    def audio_bitrate # :nodoc:
+    def audio_bit_rate # :nodoc:
       nil
     end
     
@@ -518,7 +532,7 @@ module RVideo # :nodoc:
     
     def metadata_match
       [
-        /(Input \#.*)\nMust/m,    # ffmpegX
+        /(Input \#.*)\nMust/m,    # ffmpeg
         /(Input \#.*)\nAt least/m # ffmpeg macports
       ].each do |rgx| 
         if md=rgx.match(@raw_response)

data/lib/rvideo/tools/abstract_tool.rb

@@ -11,8 +11,11 @@ module RVideo # :nodoc:
         tool_name = cmd.split(" ").first
         begin
           tool = "RVideo::Tools::#{tool_name.classify}".constantize.send(:new, cmd, options)
-        rescue NameError, /uninitialized constant/
-          raise TranscoderError::UnknownTool, "The recipe tried to use the '#{tool_name}' tool, which does not exist."
+        # rescue NameError, /uninitialized constant/
+          # raise TranscoderError::UnknownTool, "The recipe tried to use the '#{tool_name}' tool, which does not exist."
+        rescue => e
+          LOGGER.info $!
+          LOGGER.info e.backtrace.join("\n")
         end
       end
       
@@ -30,86 +33,258 @@ module RVideo # :nodoc:
         #
         # Execute the command and parse the result.
         #
-        
+        # def execute
+        #   @output_params = {}
+        #   final_command = "#{@command} 2>&1"
+        #   Transcoder.logger.info("\nExecuting Command: #{final_command}\n")
+        #   @raw_result = `#{final_command}`
+        #   Transcoder.logger.info("Result: \n#{@raw_result}")
+        #   parse_result(@raw_result)
+        # end
+
         def execute
-          final_command = "#{@command} 2>&1"
+          @output_params = {}
+          
+          # Dump the log output into a temp file
+          log_temp_file_name = "/tmp/transcode_output_#{Time.now.to_i}.txt"
+        
+          final_command = "#{@command} 2>#{log_temp_file_name}"
           Transcoder.logger.info("\nExecuting Command: #{final_command}\n")
-          @raw_result = `#{final_command}`
+          `#{final_command}`
+          
+          populate_raw_result(log_temp_file_name)
+          
           Transcoder.logger.info("Result: \n#{@raw_result}")
           parse_result(@raw_result)
+          
+          # Cleanup log file
+          begin
+            File.delete(log_temp_file_name)
+          rescue Exception  => e
+            Transcoder.logger.error("Failed to delete output log file: #{log_temp_file_name}, e=#{e}")
+          end
         end
         
         #
         # Magic parameters
         #
+        def temp_dir
+          if @options['output_file']
+            "#{File.dirname(@options['output_file'])}/"
+          else
+            ""
+          end
+        end
+        
         
-        def original_fps
-          raise ParameterError, "The #{self.class} tool has not implemented the original_fps method."
+        def fps
+          format_fps(get_fps)
         end
         
-        def resolution
-          if @options['resolution']
-            @options['resolution']
+        def get_fps
+          inspect_original if @original.nil?
+          fps = @options['fps'] || ""
+          case fps
+          when "copy"
+            get_original_fps
           else
-            "#{calculate_width}x#{calculate_height}"
+            get_specific_fps
           end
         end
-
-        def aspect_ratio
-          "#{calculate_width}:#{calculate_height}"
+        
+        
+        def resolution
+          format_resolution(get_resolution)
         end
-
-        def fps
-          case fps.to_s
-          when "?"
-            inspect_original if @original.nil?
-            @original.fps
+        
+        def get_resolution
+          inspect_original if @original.nil?
+          resolution_setting = @options['resolution'] || ""
+          case resolution_setting
+          when "copy"
+            get_original_resolution
+          when "width"
+            get_fit_to_width_resolution
+          when "height"
+            get_fit_to_height_resolution
+          when "letterbox"
+            get_letterbox_resolution
           else
-            @options['fps']
+            get_specific_resolution
           end
         end
+        
+        
+        def audio_channels
+          format_audio_channels(get_audio_channels)
+        end
 
-        def calculate_width
-          width = @options['width']
-          height = @options['height']
-          if width.to_i > 0
-            width
+        def get_audio_channels
+          channels = @options['audio_channels'] || ""
+          case channels
+          when "stereo"
+            get_stereo_audio
+          when "mono"
+            get_mono_audio
+          else
+            {}
           end
-
-          case width
-          when "x"
-            inspect_original if @original.nil?
-            x = ((@original.width.to_f / @original.height.to_f) * height.to_f).to_i
-            (x.to_f / 16).round * 16
-          when "?"
-            inspect_original if @original.nil?
-            @original.width
+        end  
+        
+        def audio_bit_rate
+          format_audio_bit_rate(get_audio_bit_rate)
+        end
+        
+        def get_audio_bit_rate
+          bit_rate = @options['audio_bit_rate'] || ""
+          case bit_rate
+          when ""
+            {}
           else
-            width
+            get_specific_audio_bit_rate
           end
         end
-
-        def calculate_height
-          width = @options['width']
-          height = @options['height']
-          if height.to_i > 0
-            height
+        
+        def audio_sample_rate
+          format_audio_sample_rate(get_audio_sample_rate)
+        end
+        
+        def get_audio_sample_rate
+          sample_rate = @options['audio_sample_rate'] || ""
+          case sample_rate
+          when ""
+            {}
+          else
+            get_specific_audio_sample_rate
           end
-          #w/(ow/oh) = h
-
-          case height
-          when "x"
-            inspect_original if @original.nil?
-            x = (width.to_f / (@original.width.to_f / @original.height.to_f)).to_i
-            (x.to_f / 16).round * 16
-          when "?"
-            inspect_original if @original.nil?
-            @original.height
+        end
+        
+        def video_quality
+          format_video_quality(get_video_quality)
+        end
+        
+        def get_video_quality
+          inspect_original if @original.nil?
+          quality = @options['video_quality'] || 'medium'
+          video_bit_rate = @options['video_bit_rate'] || nil
+          h = {:video_quality => quality, :video_bit_rate => video_bit_rate}
+          h.merge!(get_fps).merge!(get_resolution)
+        end
+        
+        
+        
+        def get_fit_to_width_resolution
+          w = @options['width']
+          raise TranscoderError::ParameterError, "invalid width of '#{w}' for fit to width" unless valid_dimension?(w)
+          h = calculate_height(@original.width, @original.height, w)
+          {:scale => {:width => w, :height => h}}
+        end
+        
+        def get_fit_to_height_resolution
+          h = @options['height']
+          raise TranscoderError::ParameterError, "invalid height of '#{h}' for fit to height" unless valid_dimension?(h)
+          w = calculate_width(@original.width, @original.height, h)
+          {:scale => {:width => w, :height => h}}
+        end
+        
+        def get_letterbox_resolution
+          lw = @options['width'].to_i
+          lh = @options['height'].to_i
+          raise TranscoderError::ParameterError, "invalid width of '#{lw}' for letterbox" unless valid_dimension?(lw)
+          raise TranscoderError::ParameterError, "invalid height of '#{lh}' for letterbox" unless valid_dimension?(lh)
+          w = calculate_width(@original.width, @original.height, lh)
+          h = calculate_height(@original.width, @original.height, lw)
+          if w > lw
+            w = lw
+            h = calculate_height(@original.width, @original.height, lw)
           else
-            height
+            h = lh
+            w = calculate_width(@original.width, @original.height, lh)
           end
+          {:scale => {:width => w, :height => h}, :letterbox => {:width => lw, :height => lh}}
+        end
+        
+        def get_original_resolution
+          {:scale => {:width => @original.width, :height => @original.height}}
+        end
+
+        def get_specific_resolution
+          w = @options['width']
+          h = @options['height']
+          raise TranscoderError::ParameterError, "invalid width of '#{w}' for specific resolution" unless valid_dimension?(w)
+          raise TranscoderError::ParameterError, "invalid height of '#{h}' for specific resolution" unless valid_dimension?(h)
+          {:scale => {:width => w, :height => h}}
+        end
+        
+        def get_original_fps
+          return {} if @original.fps.nil?
+          {:fps => @original.fps}
+        end
+        
+        def get_specific_fps
+          {:fps => @options['fps']}
+        end
+        
+        # def get_video_quality
+        #   fps = @options['fps'] || @original.fps
+        #   raise TranscoderError::ParameterError, "could not find fps in order to determine video quality" if fps.nil?
+        #   width = @original.width
+        #   height = @
+        #   format_video_quality({:quality => @options['video_quality'], :bit_rate => @options['video_bit_rate']})
+        # end
+        
+        def get_stereo_audio
+          {:channels => "2"}
+        end
+        
+        def get_mono_audio
+          {:channels => "1"}
+        end
+        
+        def get_specific_audio_bit_rate
+          {:bit_rate => @options['audio_bit_rate']}
+        end
+        
+        def get_specific_audio_sample_rate
+          {:sample_rate => @options['audio_sample_rate']}
         end
         
+        def calculate_width(ow, oh, h)
+          w = ((ow.to_f / oh.to_f) * h.to_f).to_i
+          (w.to_f / 16).round * 16
+        end
+
+        def calculate_height(ow, oh, w)
+          h = (w.to_f / (ow.to_f / oh.to_f)).to_i
+          (h.to_f / 16).round * 16
+        end
+          
+
+        def valid_dimension?(dim)
+          return false if dim.to_i <= 0
+          return true
+        end
+        
+        def format_resolution(params={})
+          raise ParameterError, "The #{self.class} tool has not implemented the format_resolution method."
+        end
+
+        def format_fps(params={})
+          raise ParameterError, "The #{self.class} tool has not implemented the format_fps method."
+        end
+
+        def format_audio_channels(params={})
+          raise ParameterError, "The #{self.class} tool has not implemented the format_audio_channels method."
+        end
+
+        def format_audio_bit_rate(params={})
+          raise ParameterError, "The #{self.class} tool has not implemented the format_audio_bit_rate method."
+        end
+
+        def format_audio_sample_rate(params={})
+          raise ParameterError, "The #{self.class} tool has not implemented the format_audio_sample_rate method."
+        end
+
         private
         
         
@@ -123,6 +298,7 @@ module RVideo # :nodoc:
 
         def interpolate_variables(raw_command)
           raw_command.scan(/[^\\]\$[-_a-zA-Z]+\$/).each do |match|
+            match = match[0..0] == "$" ? match : match[1..(match.size - 1)]
             match.strip!
             raw_command.gsub!(match, matched_variable(match))
           end
@@ -149,6 +325,13 @@ module RVideo # :nodoc:
         def inspect_original
           @original = Inspector.new(:file => options[:input_file])
         end
+        
+        # Pulls the interesting bits of the temp log file into memory.  This is fairly tool-specific, so
+        # it's doubtful that this default version is going to work without being overridded.
+        def populate_raw_result(temp_file_name)
+          @raw_result = `tail -n 500 #{temp_file_name}`
+        end
+        
       end
     
     end

data/lib/rvideo/tools/ffmpeg.rb

@@ -10,24 +10,78 @@ module RVideo
         'ffmpeg'
       end
       
-      #
-      # Return -r and the frame rate of the original file. E.g.:
-      #
-      #   -r 29.97
-      #
-      # If the original frame rate can't be determined, return an empty 
-      # string.
-      def original_fps
-        inspect_original if @original.nil?
-        if @original.fps
-          "-r #{@original.fps}" 
+      def format_fps(params={})
+        " -r #{params[:fps]}"
+      end
+      def format_video_quality(params={})
+        bitrate = params[:video_bit_rate].blank? ? nil : params[:video_bit_rate]
+        factor = (params[:scale][:width].to_f * params[:scale][:height].to_f * params[:fps].to_f)
+        case params[:video_quality]
+        when 'low'
+          bitrate ||= (factor / 12000).to_i
+          " -v #{bitrate}k -crf 30 -me zero -subq 1 -refs 1 -threads auto "
+        when 'medium'
+          bitrate ||= (factor / 9000).to_i
+          " -v #{bitrate}k -crf 22 -flags +loop -cmp +sad -partitions +parti4x4+partp8x8+partb8x8 -flags2 +mixed_refs -me hex -subq 3 -trellis 1 -refs 2 -bf 3 -b_strategy 1 -coder 1 -me_range 16 -g 250"
+        when 'high'
+          bitrate ||= (factor / 3600).to_i
+          " -v #{bitrate}k -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"
         else
           ""
         end
+      end  
+      
+      
+      def format_resolution(params={})
+        p = " -s #{params[:scale][:width]}x#{params[:scale][:height]} "
+        if params[:letterbox]
+          plr = ((params[:letterbox][:width] - params[:scale][:width]) / 2).to_i
+          ptb = ((params[:letterbox][:height] - params[:scale][:height]) / 2).to_i
+          p += " -padtop #{ptb} -padbottom #{ptb} -padleft #{plr} -padright #{plr} "
+        end
+        p
+      end
+
+      def format_audio_channels(params={})
+        " -ac #{params[:channels]}"
+      end
+      
+      def format_audio_bit_rate(params={})
+        " -ab #{params[:bit_rate]}k"
       end
       
+      def format_audio_sample_rate(params={})
+        " -ar #{params[:sample_rate]}"
+      end
+      
+      
       private
       
+      # Turns the temp log file into a useful string, from which we can parse the 
+      # transcoding results.
+      # These log files can be enormous, so pulling the whole thing into memory is not an 
+      # option.
+      def populate_raw_result(temp_file_name)
+        @raw_result = ""
+        
+        # Is the log file exceptionally long?  It's really not a big deal to pull in a thousand lines or so
+        # into memory.  It's the gigantic files that cause problems.  If the files isn't too large, 
+        # just pull it in.
+        line_count = 0
+        if m = /^\s*(\d+)/.match(`wc -l #{temp_file_name}`)
+          line_count = m[1].to_i
+        end
+        
+        if line_count > 500
+          # Find the message indicating that the command is actually running.
+          running_string = "Press .* to stop encoding"
+          @raw_result << `grep "#{running_string}" #{temp_file_name}`
+        end
+
+        # Append the bottom of the log file, where the interesting bits live.
+        @raw_result << `tail -n 500 #{temp_file_name}`
+      end
+      
       def parse_result(result)
         
         if m = /Unable for find a suitable output format for.*$/.match(result)

data/lib/rvideo/tools/ffmpeg2theora.rb

@@ -0,0 +1,42 @@
+module RVideo
+  module Tools
+    class Ffmpeg2theora
+      include AbstractTool::InstanceMethods
+
+      attr_reader :raw_metadata
+
+      def tool_command
+        'ffmpeg2theora'
+      end
+
+      def format_video_quality(params={})
+        bitrate = params[:video_bit_rate].blank? ? nil : params[:video_bit_rate]
+        factor = (params[:scale][:width].to_f * params[:scale][:height].to_f * params[:fps].to_f)
+        case params[:video_quality]
+        when 'low'
+          " -v 1 "
+        when 'medium'
+          "-v 5 "
+        when 'high'
+          "-v 10 "
+        else
+          ""
+        end
+      end  
+
+      def parse_result(result)
+        if m = /does not exist or has an unknown data format/.match(result)
+          raise TranscoderError::InvalidFile, "I/O error"
+        end
+        
+        if m = /General output options/.match(result)
+          raise TranscoderError::InvalidCommand, "no command passed to ffmpeg2theora, or no output file specified"
+        end
+        
+        @raw_metadata = result.empty? ? "No Results" : result
+        return true
+      end
+
+    end
+  end
+end

data/lib/rvideo/tools/flvtool2.rb

@@ -1,3 +1,4 @@
+# Warning:  If you're dealing with large files, you should consider using yamdi instead.
 module RVideo
   module Tools
     class Flvtool2

data/lib/rvideo/tools/mencoder.rb

@@ -3,26 +3,67 @@ module RVideo
     class Mencoder
       include AbstractTool::InstanceMethods
 
-      attr_reader :frame, :size, :time, :bitrate, :video_size, :audio_size, :fps
-
+      attr_reader :frame, :size, :time, :bitrate, :video_size, :audio_size, :output_fps
+      
       def tool_command
         'mencoder'
       end
 
-      def original_fps
-        inspect_original if @original.nil?
-        if @original.fps
-          "-ofps #{@original.fps}" 
+      def format_fps(params={})
+        " -ofps #{params[:fps]}" 
+      end
+
+      def format_resolution(params={})
+        p = " -vf scale=#{params[:scale][:width]}:#{params[:scale][:height]}"
+        if params[:letterbox]
+          p += ",expand=#{params[:letterbox][:width]}:#{params[:letterbox][:height]}"
+        end
+        p += ",harddup"
+      end
+
+      def format_audio_channels(params={})
+        " -channels #{params[:channels]}"
+      end
+      
+      def format_audio_bit_rate(params={})
+        " br=#{params[:bit_rate]}:"
+      end
+      
+      def format_audio_sample_rate(params={})
+        " -srate #{params[:sample_rate]}"
+      end
+      
+      def format_video_quality(params={})
+        bitrate = params[:video_bit_rate].blank? ? nil : params[:video_bit_rate]
+        factor = (params[:scale][:width].to_f * params[:scale][:height].to_f * params[:fps].to_f)
+        case params[:video_quality]
+        when 'low'
+          bitrate ||= (factor / 12000).to_i
+          " -x264encopts threads=auto:subq=1:me=dia:frameref=1:crf=30:bitrate=#{bitrate} "
+        when 'medium'
+          bitrate ||= (factor / 9000).to_i
+          " -x264encopts threads=auto:subq=3:me=hex:frameref=2:crf=22:bitrate=#{bitrate} "
+        when 'high'
+          bitrate ||= (factor / 3600).to_i
+          " -x264encopts threads=auto:subq=6:me=dia:frameref=3:crf=18:bitrate=#{bitrate} "
         else
           ""
         end
-      end
+      end  
+      
 
+
+      private
+      
       def parse_result(result)
         if m = /Exiting.*No output file specified/.match(result)
           raise TranscoderError::InvalidCommand, "no command passed to mencoder, or no output file specified"
         end
         
+        if m = /counldn't set specified parameters, exiting/.match(result)
+          raise TranscoderError::InvalidCommand, "a combination of the recipe parameters is invalid: #{result}"
+        end
+
         if m = /Sorry, this file format is not recognized\/supported/.match(result)
           raise TranscoderError::InvalidFile, "unknown format"
         end
@@ -41,7 +82,7 @@ module RVideo
           @video_size = sanitary_match(/size:\s*(\d*)\s*(\S*)/, video_details[0])
           @time = sanitary_match(/bytes\s*([0-9.]*)/, video_details[0])
           @frame = sanitary_match(/secs\s*(\d*)/, video_details[0])
-          @fps = (@frame.to_f / @time.to_f).round_to(3)
+          @output_fps = (@frame.to_f / @time.to_f).round_to(3)
         elsif result =~ /Video stream is mandatory/
           raise TranscoderError::InvalidFile, "Video stream required, and no video stream found"
         end

data/lib/rvideo/tools/mp4creator.rb

@@ -9,13 +9,8 @@ module RVideo
         'mp4creator'
       end
 
-      def original_fps
-        inspect_original if @original.nil?
-        if @original.fps
-          "-rate=#{@original.fps}" 
-        else
-          ""
-        end
+      def format_fps(params={})
+          " -rate=#{params[:fps]}" 
       end
 
       def parse_result(result)
@@ -27,6 +22,10 @@ module RVideo
           raise TranscoderError::InvalidFile, "I/O error"
         end
         
+        if @options['output_file'] && !File.exist?(@options['output_file'])
+          raise TranscoderError::UnexpectedResult, "An unknown error has occured with mp4creator:#{result}"
+        end
+
         @raw_metadata = result.empty? ? "No Results" : result
         return true
       end

data/lib/rvideo/tools/yamdi.rb

@@ -0,0 +1,44 @@
+module RVideo
+  module Tools
+    class Yamdi
+      include AbstractTool::InstanceMethods
+      
+      attr_reader :raw_metadata
+      
+      def tool_command
+        'yamdi'
+      end
+      
+      private
+      
+      def parse_result(result)
+        if result.empty?
+          return true
+        end
+        
+        if m = /Couldn't stat on (.*)/.match(result)
+          raise TranscoderError::InputFileNotFound, m[0]
+        end
+        
+        if m = /The input file is not a FLV./.match(result)
+          raise TranscoderError::InvalidFile, "input must be a valid FLV file"
+        end
+          
+        if m = /\(c\) \d{4} Ingo Oppermann/i.match(result)
+          raise TranscoderError::InvalidCommand, "command printed yamdi help text (and presumably didn't execute)"
+        end
+        
+        if m = /Please provide at least one output file/i.match(result)
+          raise TranscoderError::InvalidCommand, "command did not contain a valid output file. Yamdi expects a -o switch."
+        end
+        
+        if m = /ERROR: undefined method .?timestamp.? for nil/.match(result)
+          raise TranscoderError::InvalidFile, "Output file was empty (presumably)"
+        end
+
+        raise TranscoderError::UnexpectedResult, result
+      end
+      
+    end
+  end
+end

data/lib/rvideo/version.rb

@@ -2,7 +2,7 @@ module Rvideo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 4
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rvideo.rb

@@ -9,6 +9,8 @@ require 'tools/flvtool2'
 require 'tools/mp4box'
 require 'tools/mplayer'
 require 'tools/mp4creator'
+require 'tools/ffmpeg2theora'
+require 'tools/yamdi'
 require 'errors'
 require 'transcoder'
 require 'active_support'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mhs-rvideo
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jonathan Dahl (Slantwise Design)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -05:00
+date: 2010-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,8 @@ files:
 - lib/rvideo/inspector.rb
 - lib/rvideo/tools/abstract_tool.rb
 - lib/rvideo/tools/ffmpeg.rb
+- lib/rvideo/tools/ffmpeg2theora.rb
+- lib/rvideo/tools/yamdi.rb
 - lib/rvideo/tools/flvtool2.rb
 - lib/rvideo/tools/mencoder.rb
 - lib/rvideo/tools/mp4box.rb