vcs_ruby 1.1.9 → 1.1.10

data/bin/vcs.rb

@@ -1,171 +1,171 @@
-#!/usr/bin/env ruby
-
-# Video Contact Sheet Ruby:
-# ----------------------
-#
-# Generates contact sheets of videos
-#
-# Prerequisites: Ruby, ImageMagick, ffmpeg/libav or mplayer
-#
-
-# Load library path for development
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "../lib")
-
-require 'optparse'
-require 'vcs'
-require 'yaml'
-
-include VCSRuby
-
-
-# Configuration can Override options
-options =
-{
-             quiet: false,
-           verbose: false,
-          capturer: :any,
-            format: nil,
-            output: []
-}
-
-# Command Line Parameter arguments
-
-arguments =
-{
-    '--capturer' => [:ffmpeg, :libav, :mplayer, :any],
-    '--format' => [:png, :jpg, :jpeg, :tiff],
-    '--funky' =>  [:polaroid, :photos, :overlap, :rotate, :photoframe, :polaroidframe, :film, :random]
-}
-
-# Command Line Parameters
-optparse = OptionParser.new do|opts|
-  opts.separator $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
-  opts.separator ''
-  opts.on( '-i [INTERVAL]', '--interval [INTERVAL]', 'Set the interval [INTERVAL]') do |interval|
-    options[:interval] = TimeIndex.new interval
-  end
-  opts.on( '-c [COLMNS]', '--columns [COLUMNS]', 'Arrange the output in <COLUMNS> columns.') do |columns|
-    options[:columns] = columns.to_i
-  end
-  opts.on( '-r [ROWS]', '--rows [ROWS]', 'Arrange the output in <ROWS> rows.') do |rows|
-    options[:rows] = rows.to_i
-  end
-  opts.on( '-H [HEIGHT]', '--height [HEIGHT]', 'Set the output (individual thumbnail) height.') do |height|
-    options[:height] = height.to_i
-  end
-  opts.on( '-W [WIDTH]', '--width [WIDTH]', 'Set the output (individual thumbnail) width.') do |width|
-    options[:width] = width.to_i
-  end
-  opts.on( '-A [ASPECT]', '--aspect [ASPECT]', 'Aspect ratio. Accepts a floating point number or a fraction. (i.e. 16/19)') do |aspect|
-    options[:aspect_ratio] = aspect.to_r
-  end
-  opts.on( '-f [FROM]', '--from [FROM]', 'Set starting time. No caps before this.') do |from|
-    options[:from] = TimeIndex.new from
-  end
-  opts.on( '-t [TO]', '--to [TO]', 'Set ending time. No caps beyond this.') do |to|
-    options[:to] = TimeIndex.new to
-  end
-  opts.on( '-T [TITLE]', '--title [TITLE]', 'Set ending time. No caps beyond this.') do |title|
-    options[:title] = title
-  end
-  opts.on( '-f [format]', '--format [FORMAT]', arguments['--format'], 'Formats: ' + Tools::list_arguments(arguments["--format"])) do |format|
-    options[:format] = format
-  end
-  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 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
-  opts.on( '-s [SIGNATURE]', '--signature [SIGNATURE]', 'Change the image signature to your preference.') do |signature|
-    options[:signature] = signature
-  end
-  opts.on( '--no-signature', 'Remove footer with signature') do
-    options[:no_signature] = true
-  end
-  opts.on( '-l [HIGHLIGHT]', '--highlight [HIGHLIGHT]', 'Add the frame found at timestamp [HIGHLIGHT] as a highlight.') do |highlight|
-    options[:highlight] = TimeIndex.new highlight
-  end
-  opts.on("--[no-]timestamp", "Add timestamp to thumbnails. Default: true") do |timestamp|
-    options[:timestamp] = timestamp
-  end
-  opts.on("--[no-]shadow", "Add shadow to thumbnails. Default: true") do |shadow|
-    options[:shadow] = shadow
-  end
-  opts.on("--[no-]polaroid", "Add  polaroid frame to thumbnail. Default: false") do |polaroid|
-    options[:polaroid] = polaroid
-  end
-  opts.on( '-p [PROFILE]', '--profile [PROFILE]', 'Loads additional setting from profile.yml.') do |profile|
-    options[:profile] = profile
-  end
-  opts.on( '-q', '--quiet', 'Don\'t print progress messages just errors.') do |file|
-    options[:quiet] = true
-  end
-  opts.on('--continue', 'Prints Error message and continues with next file (if any left)') do |file|
-    options[:continue] = true
-  end
-  opts.on("-V", "--verbose", "More verbose Output.") do
-    options[:verbose] = true
-  end
-  opts.on( '-v', '--version', 'Current Version' ) do
-    puts $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
-    exit 0
-  end
-
-  opts.on( '-h', '--help', 'Prints help' ) do
-    options[:help] = true
-  end
-
-  opts.separator ''
-  opts.separator 'Examples:'
-  opts.separator '  Create a contact sheet with default values (4 x 4 matrix):'
-  opts.separator '  $ vcs video.avi'
-  opts.separator ''
-  opts.separator '  Create a sheet with vidcaps at intervals of 3 and a half minutes, save to'
-  opts.separator '  "output.jpg":'
-  opts.separator '  $ vcs -i 3m30 input.wmv -o output.jpg'
-  opts.separator ''
-  opts.separator '  Create a sheet with vidcaps starting at 3 mins and ending at 18 mins in 2m intervals'
-  opts.separator '  $ vcs --from 3m --to 18m -i 2m input.avi'
-  opts.separator ''
-  opts.separator '  See more examples at vcs-ruby homepage <https://github.com/FreeApophis/vcs.rb>.'
-  opts.separator ''
-end
-
-Tools::print_help optparse if ARGV.empty?
-
-optparse.parse!
-
-Tools::print_help optparse if options[:help] || ARGV.empty?
-
-Configuration.instance.verbose = options[:verbose]
-Configuration.instance.quiet = options[:quiet]
-
-# Invoke ContactSheet
-
-errors = {}
-ARGV.each_with_index do |video, index|
-  begin
-    sheet = Tools::contact_sheet_with_options video, options
-    if sheet
-      sheet.initialize_filename(options[:output][index]) if options[:output][index]
-      sheet.build
-    end
-  rescue Exception => e
-    errors[video] = e
-    STDERR.puts "ERROR: #{e.message}"
-    STDERR.puts "#{e.backtrace.join("\n")}" if options[:verbose]
-    break unless options[:continue]
-  end
-end
-
-if options[:continue] && errors.length > 0
-  errors.each do |video, e|
-    STDERR.puts "File: #{video}"
-    STDERR.puts "ERROR: #{e.message}"
- end
- STDERR.puts "Total: #{errors.length} Errors"
-end
+#!/usr/bin/env ruby
+
+# Video Contact Sheet Ruby:
+# ----------------------
+#
+# Generates contact sheets of videos
+#
+# Prerequisites: Ruby, ImageMagick, ffmpeg/libav or mplayer
+#
+
+# Load library path for development
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "../lib")
+
+require 'optparse'
+require 'vcs'
+require 'yaml'
+
+include VCSRuby
+
+
+# Configuration can Override options
+options =
+{
+             quiet: false,
+           verbose: false,
+          capturer: :any,
+            format: nil,
+            output: []
+}
+
+# Command Line Parameter arguments
+
+arguments =
+{
+    '--capturer' => [:ffmpeg, :libav, :mplayer, :any],
+    '--format' => [:png, :jpg, :jpeg, :tiff],
+    '--funky' =>  [:polaroid, :photos, :overlap, :rotate, :photoframe, :polaroidframe, :film, :random]
+}
+
+# Command Line Parameters
+optparse = OptionParser.new do|opts|
+  opts.separator $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
+  opts.separator ''
+  opts.on( '-i [INTERVAL]', '--interval [INTERVAL]', 'Set the interval [INTERVAL]') do |interval|
+    options[:interval] = TimeIndex.new interval
+  end
+  opts.on( '-c [COLMNS]', '--columns [COLUMNS]', 'Arrange the output in <COLUMNS> columns.') do |columns|
+    options[:columns] = columns.to_i
+  end
+  opts.on( '-r [ROWS]', '--rows [ROWS]', 'Arrange the output in <ROWS> rows.') do |rows|
+    options[:rows] = rows.to_i
+  end
+  opts.on( '-H [HEIGHT]', '--height [HEIGHT]', 'Set the output (individual thumbnail) height.') do |height|
+    options[:height] = height.to_i
+  end
+  opts.on( '-W [WIDTH]', '--width [WIDTH]', 'Set the output (individual thumbnail) width.') do |width|
+    options[:width] = width.to_i
+  end
+  opts.on( '-A [ASPECT]', '--aspect [ASPECT]', 'Aspect ratio. Accepts a floating point number or a fraction. (i.e. 16/19)') do |aspect|
+    options[:aspect_ratio] = aspect.to_r
+  end
+  opts.on( '-f [FROM]', '--from [FROM]', 'Set starting time. No caps before this.') do |from|
+    options[:from] = TimeIndex.new from
+  end
+  opts.on( '-t [TO]', '--to [TO]', 'Set ending time. No caps beyond this.') do |to|
+    options[:to] = TimeIndex.new to
+  end
+  opts.on( '-T [TITLE]', '--title [TITLE]', 'Set ending time. No caps beyond this.') do |title|
+    options[:title] = title
+  end
+  opts.on( '-f [format]', '--format [FORMAT]', arguments['--format'], 'Formats: ' + Tools::list_arguments(arguments["--format"])) do |format|
+    options[:format] = format
+  end
+  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 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
+  opts.on( '-s [SIGNATURE]', '--signature [SIGNATURE]', 'Change the image signature to your preference.') do |signature|
+    options[:signature] = signature
+  end
+  opts.on( '--no-signature', 'Remove footer with signature') do
+    options[:no_signature] = true
+  end
+  opts.on( '-l [HIGHLIGHT]', '--highlight [HIGHLIGHT]', 'Add the frame found at timestamp [HIGHLIGHT] as a highlight.') do |highlight|
+    options[:highlight] = TimeIndex.new highlight
+  end
+  opts.on("--[no-]timestamp", "Add timestamp to thumbnails. Default: true") do |timestamp|
+    options[:timestamp] = timestamp
+  end
+  opts.on("--[no-]shadow", "Add shadow to thumbnails. Default: true") do |shadow|
+    options[:shadow] = shadow
+  end
+  opts.on("--[no-]polaroid", "Add  polaroid frame to thumbnail. Default: false") do |polaroid|
+    options[:polaroid] = polaroid
+  end
+  opts.on( '-p [PROFILE]', '--profile [PROFILE]', 'Loads additional setting from profile.yml.') do |profile|
+    options[:profile] = profile
+  end
+  opts.on( '-q', '--quiet', 'Don\'t print progress messages just errors.') do |file|
+    options[:quiet] = true
+  end
+  opts.on('--continue', 'Prints Error message and continues with next file (if any left)') do |file|
+    options[:continue] = true
+  end
+  opts.on("-V", "--verbose", "More verbose Output.") do
+    options[:verbose] = true
+  end
+  opts.on( '-v', '--version', 'Current Version' ) do
+    puts $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
+    exit 0
+  end
+
+  opts.on( '-h', '--help', 'Prints help' ) do
+    options[:help] = true
+  end
+
+  opts.separator ''
+  opts.separator 'Examples:'
+  opts.separator '  Create a contact sheet with default values (4 x 4 matrix):'
+  opts.separator '  $ vcs video.avi'
+  opts.separator ''
+  opts.separator '  Create a sheet with vidcaps at intervals of 3 and a half minutes, save to'
+  opts.separator '  "output.jpg":'
+  opts.separator '  $ vcs -i 3m30 input.wmv -o output.jpg'
+  opts.separator ''
+  opts.separator '  Create a sheet with vidcaps starting at 3 mins and ending at 18 mins in 2m intervals'
+  opts.separator '  $ vcs --from 3m --to 18m -i 2m input.avi'
+  opts.separator ''
+  opts.separator '  See more examples at vcs-ruby homepage <https://github.com/FreeApophis/vcs.rb>.'
+  opts.separator ''
+end
+
+Tools::print_help optparse if ARGV.empty?
+
+optparse.parse!
+
+Tools::print_help optparse if options[:help] || ARGV.empty?
+
+Configuration.instance.verbose = options[:verbose]
+Configuration.instance.quiet = options[:quiet]
+
+# Invoke ContactSheet
+
+errors = {}
+ARGV.each_with_index do |video, index|
+  begin
+    sheet = Tools::contact_sheet_with_options video, options
+    if sheet
+      sheet.initialize_filename(options[:output][index]) if options[:output][index]
+      sheet.build
+    end
+  rescue Exception => e
+    errors[video] = e
+    STDERR.puts "ERROR: #{e.message}"
+    STDERR.puts "#{e.backtrace.join("\n")}" if options[:verbose]
+    break unless options[:continue]
+  end
+end
+
+if options[:continue] && errors.length > 0
+  errors.each do |video, e|
+    STDERR.puts "File: #{video}"
+    STDERR.puts "ERROR: #{e.message}"
+ end
+ STDERR.puts "Total: #{errors.length} Errors"
+end

data/lib/FFmpeg/ffmpeg.rb

@@ -1,121 +1,121 @@
-#
-# 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? && @ffprobe.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 check_cache
-      unless @cache
-        @cache = @ffprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
-      end
-    end
-
-    def parse_format
-      @cache.scan(/\[FORMAT\](.*?)\[\/FORMAT\]/m) do |format|
-        @info = FFmpegMetaInfo.new(get_hash(format[0]))
-        return true
-      end
-      false
-    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
-      true
-    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
-      true
-    end
-  end
-end
+#
+# 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? && @ffprobe.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 check_cache
+      unless @cache
+        @cache = @ffprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
+      end
+    end
+
+    def parse_format
+      @cache.scan(/\[FORMAT\](.*?)\[\/FORMAT\]/m) do |format|
+        @info = FFmpegMetaInfo.new(get_hash(format[0]))
+        return true
+      end
+      false
+    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
+      true
+    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
+      true
+    end
+  end
+end

data/lib/FFmpeg/ffmpeg_audio_stream.rb

@@ -1,38 +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
+#
+# 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