vcs_ruby 1.1.8 → 1.1.9

data/lib/libAV/libav.rb

@@ -1,151 +1,151 @@
-#
-# libAV Abstraction
-#
-
-require 'capturer'
-require 'command'
-
-module VCSRuby
-  class LibAV < Capturer
-
-    HEADER = 10
-
-    ENCODING_SUPPORT = 2
-    VIDEO_CODEC = 3
-    NAME = 8
-
-    attr_reader :info, :video_streams, :audio_streams
-
-    def initialize video
-      @video = video
-      @avconv = Command.new :libav, 'avconv'
-      @avprobe = Command.new :libav, 'avprobe'
-
-      detect_version if available?
-    end
-
-    def file_valid?
-      return probe_meta_information
-    end
-
-    def name
-      :libav
-    end
-
-    def available?
-      @avconv.available? && @avprobe.available?
-    end
-
-
-    def detect_version
-      info = @avconv.execute('-version')
-      match = /avconv ([\d|.|-|:]*)/.match(info)
-      if match
-        @version = match[1]
-      end
-    end
-
-
-
-    def grab time, image_path
-      @avconv.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 = @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 to_s
-      "LibAV #{@version}"
-    end
-
-private
-    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 check_cache
-      unless @cache
-        @cache = @avprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
-      end
-    end
-
-    def extract_format regexp
-      @cache.scan(regexp) do |format|
-        @info = LibAVMetaInfo.new(get_hash(format[0]))
-        return true
-      end
-      false
-    end
-
-    def parse_format
-      parsed = extract_format(/\[FORMAT\](.*?)\[\/FORMAT\]/m)
-      unless parsed
-        parsed = extract_format(/\[format\](.*?)\n\n/m)
-      end
-      return parsed
-    end
-
-    def extract_audio_streams regexp
-      parsed = false
-      @cache.scan(regexp) do |stream|
-        info = get_hash(stream[0])
-        if info['codec_type'] == 'audio'
-          @audio_streams << LibAVAudioStream.new(info)
-          parsed = true
-        end
-      end
-      parsed
-    end
-
-    def parse_audio_streams
-      @audio_streams = []
-      parsed = extract_audio_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
-      unless parsed
-        extract_audio_streams(/\[streams.stream.\d\](.*?)\n\n/m)
-      end
-      true
-    end
-
-    def extract_video_streams regexp
-      parsed = false
-      @cache.scan(regexp) do |stream|
-        info = get_hash(stream[0])
-        if info['codec_type'] == 'video'
-          @video_streams << LibAVVideoStream.new(info)
-          parsed = true
-        end
-      end
-      parsed
-    end
-
-    def parse_video_streams
-      @video_streams = []
-      parsed = extract_video_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
-      unless parsed
-        parsed = extract_video_streams(/\[streams.stream.\d\](.*?)\n\n/m)
-      end
-      true
-    end
-  end
-end
+#
+# libAV Abstraction
+#
+
+require 'capturer'
+require 'command'
+
+module VCSRuby
+  class LibAV < Capturer
+
+    HEADER = 10
+
+    ENCODING_SUPPORT = 2
+    VIDEO_CODEC = 3
+    NAME = 8
+
+    attr_reader :info, :video_streams, :audio_streams
+
+    def initialize video
+      @video = video
+      @avconv = Command.new :libav, 'avconv'
+      @avprobe = Command.new :libav, 'avprobe'
+
+      detect_version if available?
+    end
+
+    def file_valid?
+      return probe_meta_information
+    end
+
+    def name
+      :libav
+    end
+
+    def available?
+      @avconv.available? && @avprobe.available?
+    end
+
+
+    def detect_version
+      info = @avconv.execute('-version')
+      match = /avconv ([\d|.|-|:]*)/.match(info)
+      if match
+        @version = match[1]
+      end
+    end
+
+
+
+    def grab time, image_path
+      @avconv.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 = @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 to_s
+      "LibAV #{@version}"
+    end
+
+private
+    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 check_cache
+      unless @cache
+        @cache = @avprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
+      end
+    end
+
+    def extract_format regexp
+      @cache.scan(regexp) do |format|
+        @info = LibAVMetaInfo.new(get_hash(format[0]))
+        return true
+      end
+      false
+    end
+
+    def parse_format
+      parsed = extract_format(/\[FORMAT\](.*?)\[\/FORMAT\]/m)
+      unless parsed
+        parsed = extract_format(/\[format\](.*?)\n\n/m)
+      end
+      return parsed
+    end
+
+    def extract_audio_streams regexp
+      parsed = false
+      @cache.scan(regexp) do |stream|
+        info = get_hash(stream[0])
+        if info['codec_type'] == 'audio'
+          @audio_streams << LibAVAudioStream.new(info)
+          parsed = true
+        end
+      end
+      parsed
+    end
+
+    def parse_audio_streams
+      @audio_streams = []
+      parsed = extract_audio_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
+      unless parsed
+        extract_audio_streams(/\[streams.stream.\d\](.*?)\n\n/m)
+      end
+      true
+    end
+
+    def extract_video_streams regexp
+      parsed = false
+      @cache.scan(regexp) do |stream|
+        info = get_hash(stream[0])
+        if info['codec_type'] == 'video'
+          @video_streams << LibAVVideoStream.new(info)
+          parsed = true
+        end
+      end
+      parsed
+    end
+
+    def parse_video_streams
+      @video_streams = []
+      parsed = extract_video_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
+      unless parsed
+        parsed = extract_video_streams(/\[streams.stream.\d\](.*?)\n\n/m)
+      end
+      true
+    end
+  end
+end

data/lib/libAV/libav_audio_stream.rb

@@ -1,38 +1,38 @@
-#
-# Implementes AudioStream Interface for libAV
-#
-
-# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
-module VCSRuby
-  class LibAVAudioStream
-    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
+#
+# Implementes AudioStream Interface for libAV
+#
+
+# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
+module VCSRuby
+  class LibAVAudioStream
+    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/libAV/libav_meta_info.rb

@@ -1,37 +1,37 @@
-#
-# Implementes MetaInfo Interface for libAV
-#
-
-# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
-
-require_relative '../time_index'
-
-module VCSRuby
-  class LibAVMetaInfo
-    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
+#
+# Implementes MetaInfo Interface for libAV
+#
+
+# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
+
+require_relative '../time_index'
+
+module VCSRuby
+  class LibAVMetaInfo
+    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/libAV/libav_video_stream.rb

@@ -1,56 +1,62 @@
-#
-# Implementes VideoStream Interface for libAV
-#
-
-# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
-
-module VCSRuby
-  class LibAVVideoStream
-    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
-      if @raw['r_frame_rate']
-        @raw['r_frame_rate'].to_r
-      elsif @raw['avg_frame_rate']
-        @raw['avg_frame_rate'].to_r
-      end
-    end
-
-    def aspect_ratio
-      @raw['display_aspect_ratio']
-    end
-  end
-end
+#
+# Implementes VideoStream Interface for libAV
+#
+
+# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
+
+module VCSRuby
+  class LibAVVideoStream
+    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
+      if @raw['r_frame_rate']
+        @raw['r_frame_rate'].to_r
+      elsif @raw['avg_frame_rate']
+        @raw['avg_frame_rate'].to_r
+      end
+    end
+
+    def aspect_ratio
+      colon = ":"
+      if @raw['display_aspect_ratio'].include? colon
+        w,h = @raw['display_aspect_ratio'].split(colon)
+        Rational(w,h)
+      else
+        @raw['display_aspect_ratio'].to_f
+      end
+    end
+  end
+end

data/lib/oldstyle.yml

@@ -1,22 +1,22 @@
-style:
-  header:
-    font: Nimbus-Mono-L-Bold
-    size: 18
-    color: Green
-    background: Black
-  title:
-    font: Nimbus-Mono-L-Bold
-    size: 40
-    color: Green
-    background: Black
-    color: White
-    background: Black
-  contact:
-    background: Black
-  signature:
-    font: Nimbus-Mono-L-Bold
-    size: 18
-    color: Green
-    background: Black
-filter:
-  softshadow: false
+style:
+  header:
+    font: Nimbus-Mono-L-Bold
+    size: 18
+    color: Green
+    background: Black
+  title:
+    font: Nimbus-Mono-L-Bold
+    size: 40
+    color: Green
+    background: Black
+    color: White
+    background: Black
+  contact:
+    background: Black
+  signature:
+    font: Nimbus-Mono-L-Bold
+    size: 18
+    color: Green
+    background: Black
+filter:
+  softshadow: false

data/lib/stream.rb

@@ -1,24 +1,24 @@
-#
-# Represents a stream in a video
-#
-
-require 'vcs'
-
-module VCSRuby
-  class Stream
-    def initialize stream
-      @stream = stream
-      create_accessors
-    end
-
-    def create_accessors
-      @stream.each do |key, value|
-        self.class.send :define_method, key.to_sym do
-          return @stream[key]
-        end
-      end
-    end
-
-    private
-  end
-end
+#
+# Represents a stream in a video
+#
+
+require 'vcs'
+
+module VCSRuby
+  class Stream
+    def initialize stream
+      @stream = stream
+      create_accessors
+    end
+
+    def create_accessors
+      @stream.each do |key, value|
+        self.class.send :define_method, key.to_sym do
+          return @stream[key]
+        end
+      end
+    end
+
+    private
+  end
+end