vcs_ruby 1.0.1 → 1.1.0

data/bin/vcs.rb

@@ -74,12 +74,12 @@ optparse = OptionParser.new do|opts|
   opts.on('-C [CAPTURER]', '--capture [CAPTURER]', arguments['--capturer'], 'Capturer: ' + Tools::list_arguments(arguments["--capturer"])) do |capturer|
     options[:capturer] = capturer
   end
-  opts.on( '-T [TITLE]', '--title [TITLE]', 'Set ending time. No caps beyond this.') do |title|
+  opts.on( '-T [TITLE]', '--title [TITLE]', 'Set Title') do |title|
     options[:title] = title
   end
   opts.on( '-o [FILE]', '--output [FILE]', 'File name of output. When ommited will be derived from the input filename. Can be repeated for multiple files.') do |file|
     options[:output] << file
-  end	
+  end
   opts.on( '-s [SIGNATURE]', '--signature [SIGNATURE]', 'Change the image signature to your preference.') do |signature|
     options[:signature] = signature
   end
@@ -141,8 +141,8 @@ optparse.parse!
 
 Tools::print_help optparse if options[:help] || ARGV.empty?
 
-Tools::verbose = options[:verbose]
-Tools::quiet = options[:quiet]
+Configuration.instance.verbose = options[:verbose]
+Configuration.instance.quiet = options[:quiet]
 
 # Invoke ContactSheet
 

data/lib/FFmpeg/ffmpeg.rb

@@ -0,0 +1,141 @@
+#
+# FFmpeg Abstraction
+#
+
+require 'capturer'
+require 'command'
+
+module VCSRuby
+  class FFmpeg < Capturer
+
+    HEADER = 10
+    ENCODING_SUPPORT = 2
+    VIDEO_CODEC = 3
+    NAME = 8
+
+    attr_reader :info, :video_streams, :audio_streams
+
+    def initialize video
+      @video = video
+      @ffmpeg = Command.new :ffmpeg, 'ffmpeg'
+      @ffprobe = Command.new :ffmpeg, 'ffprobe'
+
+      detect_version if available?
+    end
+
+    def file_valid?
+      return probe_meta_information
+    end
+
+    def name
+      :ffmpeg
+    end
+
+    def available?
+      @ffmpeg.available? && !libav?
+    end
+
+    def libav?
+      @libav
+    end
+
+    def detect_version
+      info = @ffmpeg.execute('-version')
+      match = /avconv ([\d|.|-|:]*)/.match(info)
+      @libav = !!match
+      match = /ffmpeg version ([\d|.]*)/.match(info)
+      if match
+        @version = match[1]
+      end
+    end
+
+    def grab time, image_path
+      @ffmpeg.execute "-y -ss #{time.total_seconds} -i \"#{@video.full_path}\" -an -dframes 1 -vframes 1 -vcodec #{format} -f rawvideo \"#{image_path}\""
+    end
+
+    def available_formats
+      # Ordered by priority
+      image_formats = ['png', 'tiff', 'bmp', 'mjpeg']
+      formats = []
+
+      list = @ffprobe.execute "-codecs"
+      list.lines.drop(HEADER).each do |codec|
+        name, e, v = format_split(codec)
+        formats << name if image_formats.include?(name) && e && v
+      end
+
+      image_formats.select{ |format| formats.include?(format) }.map(&:to_sym)
+    end
+
+    def to_s
+      "FFmpeg #{@version}"
+    end
+
+private
+    def format_split line
+      e = line[ENCODING_SUPPORT] == 'E'
+      v = line[VIDEO_CODEC] == 'V'
+
+      name = line[NAME..-1].split(' ', 2).first
+      return name, e, v
+    rescue
+      return nil, false, false
+    end
+
+    def probe_meta_information
+      check_cache
+      parse_meta_info
+      return true
+    rescue Exception => e
+      puts e
+      return false
+    end
+
+    def check_cache
+      unless @cache
+        @cache = @ffprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
+      end
+    end
+
+    def get_hash defines
+      result = {}
+      defines.lines.each do |line|
+        kv = line.split("=")
+        result[kv[0].strip] = kv[1].strip if kv.count == 2
+      end
+      result
+    end
+
+    def parse_meta_info
+      parse_format
+      parse_audio_streams
+      parse_video_streams
+    end
+
+    def parse_format
+      @cache.scan(/\[FORMAT\](.*?)\[\/FORMAT\]/m) do |format|
+        @info = FFmpegMetaInfo.new(get_hash(format[0]))
+      end
+    end
+
+    def parse_audio_streams
+      @audio_streams = []
+      @cache.scan(/\[STREAM\](.*?)\[\/STREAM\]/m) do |stream|
+        info = get_hash(stream[0])
+        if info['codec_type'] == 'audio'
+          @audio_streams << FFmpegAudioStream.new(info)
+        end
+      end
+    end
+
+    def parse_video_streams
+      @video_streams = []
+      @cache.scan(/\[STREAM\](.*?)\[\/STREAM\]/m) do |stream|
+        info = get_hash(stream[0])
+        if info['codec_type'] == 'video'
+          @video_streams << FFmpegVideoStream.new(info)
+        end
+      end
+    end
+  end
+end

data/lib/FFmpeg/ffmpeg_audio_stream.rb

@@ -0,0 +1,38 @@
+#
+# Implementes AudioStream Interface for FFmpeg
+#
+
+# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
+module VCSRuby
+  class FFmpegAudioStream
+    attr_reader :raw
+
+    def initialize audio_stream
+      @raw = audio_stream
+    end
+
+    def codec short = false
+      if short
+        @raw['codec_name']
+      else
+        @raw['codec_long_name']
+      end
+    end
+
+    def channels
+      @raw['channels'].to_i
+    end
+
+    def channel_layout
+      @raw['channel_layout']
+    end
+
+    def sample_rate
+      @raw['sample_rate'].to_i
+    end
+
+    def bit_rate
+      @raw['bit_rate'].to_i
+    end
+  end
+end

data/lib/FFmpeg/ffmpeg_meta_info.rb

@@ -0,0 +1,37 @@
+#
+# Implementes MetaInfo Interface for FFmpeg
+#
+
+# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
+
+require_relative '../time_index'
+
+module VCSRuby
+  class FFmpegMetaInfo
+    attr_reader :raw
+
+    def initialize meta_info
+      @raw = meta_info
+    end
+
+    def duration
+      TimeIndex.new(@raw['duration'].to_f)
+    end
+
+    def bit_rate
+      @raw['bit_rate'].to_i
+    end
+
+    def size
+      @raw['size'].to_i
+    end
+
+    def format
+      @raw['format_long_name']
+    end
+
+    def extension
+      @raw['format_name']
+    end
+  end
+end

data/lib/FFmpeg/ffmpeg_video_stream.rb

@@ -0,0 +1,52 @@
+#
+# Implementes VideoStream Interface for FFmpeg
+#
+
+# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
+
+module VCSRuby
+  class FFmpegVideoStream
+    attr_reader :raw
+
+    def initialize video_stream
+      @raw = video_stream
+    end
+
+    def width
+      @raw['width'].to_i
+    end
+
+    def height
+      @raw['height'].to_i
+    end
+
+    def codec short = false
+      if short
+        @raw['codec_name']
+      else
+        @raw['codec_long_name']
+      end
+    end
+
+    def color_space
+      if ["unknown", "", nil].include? @raw['color_space']
+        @raw['pix_fmt']
+      else
+        @raw['color_space']
+      end
+    end
+
+    def bit_rate
+      @raw['bit_rate'].to_i
+    end
+
+
+    def frame_rate
+      Rational(@raw['r_frame_rate'])
+    end
+
+    def aspect_ratio
+      @raw['display_aspect_ratio']
+    end
+  end
+end

data/lib/{mplayer.rb → MPlayer/mplayer.rb}

@@ -2,15 +2,15 @@
 # MPlayer Abstraction
 #
 
-require 'command'
 require 'capturer'
-require 'fileutils'
+require 'command'
 
 module VCSRuby
   class MPlayer < Capturer
 
     HEADER = 2
 
+    attr_reader :info, :video_streams, :audio_streams
     def initialize video
       @video = video
       @mplayer = Command.new :mplayer, 'mplayer'
@@ -18,6 +18,10 @@ module VCSRuby
       detect_version if available?
     end
 
+    def file_valid?
+      return probe_meta_information
+    end
+
     def name
       :mplayer
     end
@@ -25,55 +29,16 @@ module VCSRuby
     def available?
       @mplayer.available?
     end
-    
+
     def detect_version
       info = @mplayer.execute('')
       match = /MPlayer (.*),/.match(info)
       @version = match[1] if match
     end
 
-    def length
-      load_probe
-      @length
-    end
-
-    def width
-      load_probe
-      @width
-    end
-
-    def height
-      load_probe
-      @height
-    end
-
-    def video_codec
-      load_probe
-      @video_codec
-    end
-
-    def audio_codec
-      load_probe
-      @audio_codec
-    end
-
-    def fps
-      load_probe
-      @fps
-    end
-
-    def file_pattern n
-      if format == :jpeg
-        "#{"%08d" % n}.jpg"
-      else
-        "#{"%08d" % n}.#{format.to_s}"
-      end
-    end
-
     def grab time, image_path
-      @mplayer.execute "-sws 9 -ao null -benchmark -vo #{@format} -quiet -frames 5 -ss #{time.total_seconds} \"#{@video}\""
-      (1..4).each { |n| FileUtils.rm(file_pattern(n)) }
-      FileUtils.mv(file_pattern(5), image_path)      
+      @mplayer.execute "-vo png -ss #{time.total_seconds} -endpos 0 \"#{@video.full_path}\""
+      FileUtils.mv(file_pattern(1), image_path)
     end
 
     def available_formats
@@ -90,35 +55,55 @@ module VCSRuby
       image_formats.select{ |format| formats.include?(format) }.map(&:to_sym)
     end
 
-    def format_split line
-      name = line.strip.split(' ', 2).first
-    end
-
     def to_s
       "MPlayer #{@version}"
     end
+
   private
-    def parsed?
-      !!@parsed
+    def format_split line
+      name = line.strip.split(' ', 2).first
+    end
+    def probe_meta_information
+      check_cache
+      parse_meta_info
+      return true
+    rescue Exception => e
+      puts e
+      return false
     end
 
-    def load_probe
-      unless parsed?
-        parse_identify(@mplayer.execute("-ao null -vo null -identify -frames 0 -quiet \"#{@video}\""))
+    def check_cache
+      unless @cache
+        @cache = @mplayer.execute("-ao null -vo null -identify -frames 0 -really-quiet \"#{@video.full_path}\"")
       end
     end
 
-    def parse_identify info
-      info.lines.each do |line|
-        key, value = line.split('=', 2)
-        @length = TimeIndex.new value.to_f if key == 'ID_LENGTH'
-        @width = value.to_i if key == 'ID_VIDEO_WIDTH'
-        @height = value.to_i if key == 'ID_VIDEO_HEIGHT'
-        @video_codec = value.chomp if key == 'ID_VIDEO_FORMAT'
-        @audio_codec = value.chomp if key == 'ID_AUDIO_FORMAT'
-        @fps = value.to_f if key == 'ID_VIDEO_FPS'
+    def get_hash defines
+      result = {}
+      defines.lines.each do |line|
+        kv = line.split("=")
+        result[kv[0].strip] = kv[1].strip if kv.count == 2
+      end
+      result
+    end
+
+    def parse_meta_info
+      mplayer_hash = get_hash(@cache)
+      @info = MPlayerMetaInfo.new(mplayer_hash, File.size(@video.full_path))
+
+      # Todo: Handling of multiple streams
+      @video_streams = []
+      @video_streams << MPlayerVideoStream.new(mplayer_hash)
+      @audio_streams = []
+      @audio_streams << MPlayerAudioStream.new(mplayer_hash)
+    end
+
+    def file_pattern n
+      if format == :jpeg
+        "#{"%08d" % n}.jpg"
+      else
+        "#{"%08d" % n}.#{format.to_s}"
       end
-      @parsed = true
     end
   end
 end

data/lib/MPlayer/mplayer_audio_stream.rb

@@ -0,0 +1,35 @@
+#
+# Implementes AudioStream Interface for MPlayer
+#
+
+# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
+module VCSRuby
+  class MPlayerAudioStream
+    attr_reader :raw
+
+    def initialize audio_stream
+      @raw = audio_stream
+
+    end
+
+    def codec short = false
+      @raw['ID_AUDIO_CODEC']
+    end
+
+    def channels
+      @raw['ID_AUDIO_NCH'].to_i
+    end
+
+    def channel_layout
+      ''
+    end
+
+    def sample_rate
+      @raw['ID_AUDIO_RATE'].to_i
+    end
+
+    def bit_rate
+      @raw['ID_AUDIO_BITRATE'].to_i
+    end
+  end
+end

data/lib/MPlayer/mplayer_meta_info.rb

@@ -0,0 +1,40 @@
+#
+# Implementes MetaInfo Interface for MPlayer
+#
+
+# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
+
+require_relative '../time_index'
+
+module VCSRuby
+  class MPlayerMetaInfo
+    attr_reader :raw
+
+    def initialize meta_info, filesize
+      @raw = meta_info
+      @filesize = filesize
+    end
+
+    def duration
+      TimeIndex.new(@raw['ID_LENGTH'].to_f)
+    end
+
+    def bit_rate
+      @raw['ID_AUDIO_BITRATE'].to_i + @raw['ID_VIDEO_BITRATE'].to_i
+    end
+
+    def size
+      @filesize
+    end
+
+    def format
+      extension
+    end
+
+    def extension
+      ext = File.extname(@raw['ID_FILENAME'])
+      ext[0] = ''
+      ext
+    end
+  end
+end

data/lib/MPlayer/mplayer_video_stream.rb

@@ -0,0 +1,44 @@
+#
+# Implementes VideoStream Interface for MPlayer
+#
+
+# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
+
+module VCSRuby
+  class MPlayerVideoStream
+    attr_reader :raw
+
+    def initialize video_stream
+      @raw = video_stream
+    end
+
+    def width
+      @raw['ID_VIDEO_WIDTH'].to_i
+    end
+
+    def height
+      @raw['ID_VIDEO_HEIGHT'].to_i
+    end
+
+    def codec short = false
+      @raw['ID_VIDEO_FORMAT']
+    end
+
+    def color_space
+      ''
+    end
+
+    def bit_rate
+      @raw['ID_VIDEO_BITRATE'].to_i
+    end
+
+
+    def frame_rate
+      @raw['ID_VIDEO_FPS'].to_f
+    end
+
+    def aspect_ratio
+      ''
+    end
+  end
+end

data/lib/capturer.rb

@@ -2,42 +2,38 @@
 # Capturer Baseclass
 #
 
+require 'vcs'
+
 module VCSRuby
   class Capturer
+    $formats = { :png => 'png', :bmp => 'bmp', :tiff => 'tif', :mjpeg => 'jpg', :jpeg => 'jpg', :jpg => 'jpg' }
+
     def available?
       false
     end
 
-    def name
-      raise "NotImplementedException"
-    end
+    def self.initialize_capturers video
+      capturers = []
 
-    def load_video
-      raise "NotImplementedException"
+      puts "Available capturers: #{available_capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
     end
 
-    def length
-      raise "NotImplementedException"
-    end
+    def self.create
+      capturers = []
 
-    def width
-      raise "NotImplementedException"
-    end
+      capturers << LibAV.new(video)
+      capturers << MPlayer.new(video)
+      capturers << FFmpeg.new(video)
 
-    def height
-      raise "NotImplementedException"
+      return capturers.first
     end
 
-    def grab time, image_path
-      raise "NotImplementedException"
-    end
-
-    def available_formats
-      raise "NotImplementedException"
+    def format
+      @format || available_formats.first
     end
 
-    def format
-      @format
+    def format_extension
+      $formats[format]
     end
 
     def format= format

data/lib/command.rb

@@ -17,7 +17,7 @@ module VCSRuby
 
     def execute parameter, streams = 0, no_error = false
       raise "Command '#{name}' not available" unless available?
-      puts "#{@command} #{parameter} #{streams}" if Tools.verbose?
+      puts "#{@command} #{parameter}" if Configuration.instance.verbose?
       result = nil
       if Tools::windows?
         streams = '2> nul' if streams === 0
@@ -40,7 +40,9 @@ private
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
           exe = File.join(path, "#{cmd}#{ext}")
-          return exe if File.executable?(exe) && !File.directory?(exe)
+          if File.executable?(exe) && !File.directory?(exe)
+            return exe
+          end
         end
       end
       return nil