vcs_ruby 1.0.1 → 1.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,13 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -24,6 +27,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -32,6 +38,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
@@ -40,6 +49,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
@@ -48,17 +60,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 11.0.0
 description: Creates a contact sheet, a preview, of a video, usable as library or
   as a script. Based on VCS *NIX. Creating Thumbnails with libav, ffmpeg or mplayer
   and compose it with ImageMagick into nice looking sheets.
@@ -68,17 +86,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/frame.rb
+- lib/video.rb
+- lib/MPlayer/mplayer_video_stream.rb
+- lib/MPlayer/mplayer.rb
+- lib/MPlayer/mplayer_audio_stream.rb
+- lib/MPlayer/mplayer_meta_info.rb
+- lib/libAV/libav_audio_stream.rb
+- lib/libAV/libav_meta_info.rb
+- lib/libAV/libav_video_stream.rb
+- lib/libAV/libav.rb
 - lib/time_index.rb
 - lib/font.rb
+- lib/stream.rb
 - lib/tools.rb
-- lib/mplayer.rb
-- lib/thumbnail.rb
 - lib/contact_sheet.rb
-- lib/ffmpeg.rb
 - lib/version.rb
-- lib/libav.rb
 - lib/white.yml
 - lib/capturer.rb
+- lib/FFmpeg/ffmpeg_meta_info.rb
+- lib/FFmpeg/ffmpeg_video_stream.rb
+- lib/FFmpeg/ffmpeg.rb
+- lib/FFmpeg/ffmpeg_audio_stream.rb
 - lib/version.info
 - lib/vcs.rb
 - lib/command.rb

data/lib/ffmpeg.rb

@@ -1,183 +0,0 @@
-#
-# FFmpeg Abstraction
-#
-
-require 'capturer'
-require 'command'
-require 'time_index'
-
-module VCSRuby
-  class FFmpeg < Capturer
-
-    CODEC = 3
-    DIMENSION = 5
-    FPS = 7
-
-    HEADER = 10
-
-    ENCODING_SUPPORT = 2
-    VIDEO_CODEC = 3
-    NAME = 8
-
-    def initialize video
-      @video = video
-      @ffmpeg = Command.new :ffmpeg, 'ffmpeg'
-      @ffprobe = Command.new :ffmpeg, 'ffprobe'
-      
-      detect_version if available?
-    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 = true if match
-      match = /ffmpeg version ([\d|.]*)/.match(info)
-      if match
-        @version = match[1]
-      end
-    end
-
-    def length
-      load_probe
-      match = /Duration: ([\d|:|.]*)/.match(@cache)
-      return TimeIndex.new match[1]
-    end
-
-    def width
-      load_probe
-      @width
-    end
-
-    def height
-      load_probe
-      @height
-    end
-
-    def par
-      load_probe
-      @par
-    end
-
-    def dar
-      load_probe
-      @dar
-    end
-
-    def fps
-      load_probe
-      @fps
-    end
-
-    def video_codec
-      load_probe
-
-      @video_codec
-    end
-
-    def audio_codec
-      load_probe
-
-      @audio_codec
-    end
-
-    def grab time, image_path
-      @ffmpeg.execute "-y -ss #{time.total_seconds} -i \"#{@video}\" -an -dframes 1 -vframes 1 -vcodec png -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 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 to_s
-      "FFmpeg #{@version}"
-    end
-
-private
-    def load_probe
-      return if @cache
-
-      @cache = @ffprobe.execute("\"#{@video}\"", "2>&1")
-      puts @cache if Tools.verbose?
-
-      parse_video_streams
-      parse_audio_streams
-    end
-
-    def parse_video_streams
-      video_stream = split_stream_line(is_stream?(@cache, /Video/).first)
-
-      dimensions = /(\d*)x(\d*) \[PAR (\d*:\d*) DAR (\d*:\d*)\]/.match(video_stream[DIMENSION])
-
-      if dimensions
-        @par = dimensions[3]
-        @dar = dimensions[4]
-      else
-        dimensions = /(\d*)x(\d*)/.match(video_stream[DIMENSION])
-      end
-
-      if dimensions
-        @width = dimensions[1].to_i
-        @height = dimensions[2].to_i
-      end
-
-      fps = /([\d|.]+) fps/.match(video_stream[FPS])
-      @fps = fps ? fps[1].to_f : 0.0
-
-      @video_codec = video_stream[CODEC]
-    end
-
-    def parse_audio_streams
-      audio_stream = split_stream_line(is_stream?(@cache, /Audio/).first)
-
-      @audio_codec = audio_stream[CODEC]
-    end
-
-    def is_stream? probe, regex
-      streams(probe).select{ |s| s =~ regex }
-    end
-
-    def streams probe
-      @cache.split(/\r?\n/).map(&:strip).select{|l| l.start_with? 'Stream' }
-    end
-
-    def split_stream_line line
-      parts = line.split(',')
-      stream = parts.shift
-      result = stream.split(':')
-      result += parts
-      return result.map(&:strip)
-    end
-  end
-end

data/lib/libav.rb

@@ -1,181 +0,0 @@
-#
-# FFmpeg Abstraction
-#
-
-require 'capturer'
-require 'command'
-require 'time_index'
-
-module VCSRuby
-  class LibAV < Capturer
-
-    CODEC = 2
-    DIMENSION = 4
-    FPS = 6
-
-    HEADER = 10
-
-    ENCODING_SUPPORT = 2
-    VIDEO_CODEC = 3
-    NAME = 8
-
-    def initialize video
-      @video = video
-      @avconv = Command.new :libav, 'avconv'
-      @avprobe = Command.new :libav, 'avprobe'
-      
-      detect_version if available?
-    end
-
-    def name
-      :libav
-    end
-
-    def available?
-      @avconv.available? && @avprobe.available?
-    end
-
-
-    def detect_version
-      info = @avconv.execute('-version')
-      match = /avconv ([\d|.|-|:]*)/.match(info)
-      @version = match[1] if match
-    end
-
-    def length
-      load_probe
-      match = /Duration: ([\d|:|.]*)/.match(@cache)
-      return TimeIndex.new match[1]
-    end
-
-    def width
-      load_probe
-      @width
-    end
-
-    def height
-      load_probe
-      @height
-    end
-
-    def par
-      load_probe
-      @par
-    end
-
-    def dar
-      load_probe
-      @dar
-    end
-
-    def fps
-      load_probe
-      @fps
-    end
-
-    def video_codec
-      load_probe
-
-      @video_codec
-    end
-
-    def audio_codec
-      load_probe
-
-      @audio_codec
-    end
-
-    def grab time, image_path
-      @avconv.execute "-y -ss #{time.total_seconds} -i \"#{@video}\" -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 = @avprobe.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 format_split line
-      correction = 0
-      unless line[0] == ' '
-        correction = 1
-      end
-      e = line[ENCODING_SUPPORT - correction] == 'E'
-      v = line[VIDEO_CODEC - correction] == 'V'
-
-      name = line[NAME-correction..-1].split(' ', 2).first
-      return name, e, v
-    rescue
-      return nil, false, false
-    end
-
-    def to_s
-      "LibAV #{@version}"
-    end
-
-private
-    def load_probe
-      return if @cache
-
-      @cache = @avprobe.execute("\"#{@video}\"", "2>&1")
-      puts @cache if Tools.verbose?
-
-      parse_video_streams
-      parse_audio_streams
-    end
-
-    def parse_video_streams
-      video_stream = split_stream_line(is_stream?(@cache, /Video/).first)
-
-      dimensions = /(\d*)x(\d*) \[PAR (\d*:\d*) DAR (\d*:\d*)\]/.match(video_stream[DIMENSION])
-
-      if dimensions
-        @par = dimensions[3]
-        @dar = dimensions[4]
-      else
-        dimensions = /(\d*)x(\d*)/.match(video_stream[DIMENSION])
-      end
-
-      if dimensions
-        @width = dimensions[1].to_i
-        @height = dimensions[2].to_i
-      end
-
-      fps = /([\d|.]+) fps/.match(video_stream[FPS])
-      @fps = fps ? fps[1].to_f : 0.0
-
-      @video_codec = video_stream[CODEC]
-    end
-
-    def parse_audio_streams
-      audio_stream = split_stream_line(is_stream?(@cache, /Audio/).first)
-
-      @audio_codec = audio_stream[CODEC]
-    end
-
-    def is_stream? probe, regex
-      streams(probe).select{ |s| s =~ regex }
-    end
-
-    def streams probe
-      @cache.split(/\r?\n/).map(&:strip).select{|l| l.start_with? 'Stream' }
-    end
-
-    def split_stream_line line
-      return [nil, nil, 'none'] unless line
-      parts = line.split(',')
-      stream = parts.shift
-      result = stream.split(':')
-      result += parts
-      return result.map(&:strip)
-    end
-  end
-end