video_screenshoter 0.1.1 → 0.2.1

data/lib/video_screenshoter.rb

@@ -6,14 +6,16 @@ require "video_screenshoter/hls"
 
 module VideoScreenshoter
   class << self
-    attr_accessor :ffmpeg, :output_dir, :output_file, :verbose
+    attr_accessor :ffmpeg, :imagemagick, :output_dir, :output_file, :verbose
   end
   self.ffmpeg = '/usr/local/bin/ffmpeg'
   self.output_dir = '/tmp/screenshots'
   self.output_file = 'scr%03d.jpg'
   self.verbose = false
+  self.imagemagick = '/usr/bin/convert'
 
   def self.new params
+    raise ArgumentError.new('Input is needed') unless params[:input]
     raise ArgumentError.new('Incorrect type param') unless [nil, 'hls', 'video'].include? params[:type]
     params[:type] ||= File.extname(params[:input]) == '.m3u8' ? 'hls' : 'video'
     params[:type] == 'hls' ? VideoScreenshoter::Hls.new(params) : VideoScreenshoter::Video.new(params)

data/lib/video_screenshoter/abstract.rb

@@ -2,14 +2,14 @@
 
 module VideoScreenshoter
   class Abstract
-    attr_accessor :ffmpeg, :output_dir, :output_file, :input, :times, :duration, :verbose, :size
+    attr_accessor :ffmpeg, :imagemagick, :output_dir, :output_file, :input, :times, :duration, :verbose, :size, :presets
 
     def initialize params
-      [:ffmpeg, :output_dir, :output_file, :verbose].each do |attr|
+      [:ffmpeg, :imagemagick, :output_dir, :output_file, :verbose].each do |attr|
         self.send("#{attr}=".to_sym, params[attr].nil? ? VideoScreenshoter.send(attr) : params[attr])
       end
       FileUtils.mkdir_p self.output_dir
-      self.input = params[:input] or raise ArgumentError.new('Input is needed')
+      self.input = params[:input]
       self.duration = input_duration
       raise ArgumentError.new('Incorrect or empty m3u8 playlist') if duration.to_i == 0
       self.times = params[:times].to_a.map do |time|
@@ -21,16 +21,43 @@ module VideoScreenshoter
         time
       end.uniq
       self.size = params[:size] ? "-s #{params[:size]}" : ''
+      if params[:presets] && params[:presets].is_a?(Hash)
+        self.presets = {}
+        params[:presets].each do |name, preset|
+          self.presets[name.to_sym] = !preset || preset.empty? || preset.index('-') == 0 ? preset : "-resize #{preset}"
+        end
+      end
     end
 
-    def output_fullpath time
-      sprintf(File.join(output_dir, output_file), time)
+    def output_fullpath time, preset = nil
+      res = sprintf(File.join(output_dir, output_file), time)
+      res.sub!(File.extname(res), "_#{preset}#{File.extname(res)}") if preset
+      res
     end
 
-    def command input, output, time
+    def ffmpeg_command input, output, time
       "#{ffmpeg} -i #{input} -acodec -an -ss #{time} #{size} -f image2 -vframes 1 -y #{output} 2>/dev/null 1>&2"
     end
 
+    def imagemagick_command input, preset_name
+      preset = presets[preset_name.to_sym]
+      if !preset || preset.empty?
+        "cp #{input} #{File.join(File.dirname(input), File.basename(input, File.extname(input)) + '_' + preset_name.to_s + File.extname(input))}"
+      else
+        "#{imagemagick} #{input} #{preset} #{File.join(File.dirname(input), File.basename(input, File.extname(input)) + '_' + preset_name.to_s + File.extname(input))}"
+      end
+    end
+
+    def imagemagick_run scr
+      if presets
+        presets.each do |preset_name, preset|
+          cmd = imagemagick_command(scr, preset_name)
+          puts cmd if verbose
+          `#{cmd}`
+        end
+      end
+    end
+
     def run
       raise NotImplementedError
     end

data/lib/video_screenshoter/hls.rb

@@ -13,17 +13,22 @@ module VideoScreenshoter
         chunk_limits.push({:start => time, :end => time + chunk.first, :path => chunk.last})
         time + chunk.first
       end
+      threads = []
       times.each do |time|
-        if chunk_limit = chunk_limits.select { |c| time >= c[:start] && time <= c[:end] }.first
-          path = File.join(File.dirname(input), chunk_limit[:path])
-          rel_time = time - chunk_limit[:start]
-          cmd = command(path, output_fullpath(time), rel_time)
-          puts cmd if verbose
-          `#{cmd}`
-        else
-          puts "Time #{time} is incorrect" if verbose
+        threads << Thread.new do
+          if chunk_limit = chunk_limits.select { |c| time >= c[:start] && time <= c[:end] }.first
+            path = File.join(File.dirname(input), chunk_limit[:path])
+            rel_time = time - chunk_limit[:start]
+            cmd = ffmpeg_command(path, output_fullpath(time), rel_time)
+            puts cmd if verbose
+            `#{cmd}`
+            imagemagick_run output_fullpath(time)
+          else
+            puts "Time #{time} is incorrect" if verbose
+          end
         end
       end
+      threads.each { |t| t.join  }
     end
 
     alias :make_screenshots :run

data/lib/video_screenshoter/version.rb

@@ -1,3 +1,3 @@
 module VideoScreenshoter
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/video_screenshoter/video.rb

@@ -9,9 +9,10 @@ module VideoScreenshoter
 
     def run
       times.each do |time|
-        cmd = command(input, output_fullpath(time), time)
+        cmd = ffmpeg_command(input, output_fullpath(time), time)
         puts cmd if verbose
         `#{cmd}`
+        imagemagick_run output_fullpath(time)
       end
     end
 

data/test/video_screenshoter_test.rb

@@ -5,12 +5,32 @@ class VideoScreenshoterTest < Test::Unit::TestCase
     setup do
       @input = 'http://techslides.com/demos/sample-videos/small.mp4'
       @output_dir = '/tmp/video_screenshots_test'
-      VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => [1, -2, '50%', '-10%']).make_screenshots
+      `rm -r #{@output_dir}` if File.exists?(@output_dir)
     end
-    should 'create screenshots' do
-      [1, 2, 3, 5].each do |sec|
-        assert File.exists? File.join(@output_dir, "scr00#{sec}.jpg")
-        assert File.size(File.join(@output_dir, "scr00#{sec}.jpg")) > 0
+    
+    context '' do
+      setup do
+        VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => [1, -2, '50%', '-10%']).make_screenshots
+      end
+      
+      should 'create screenshots' do
+        [1, 2, 3, 5].each do |sec|
+          assert File.exists? File.join(@output_dir, "scr00#{sec}.jpg")
+          assert File.size(File.join(@output_dir, "scr00#{sec}.jpg")) > 0
+        end
+      end
+    end
+
+    context 'with presets' do
+      setup do
+        VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => [1, -1], :presets => {:big => '1024x768', :small => '-resize 400x100^ -gravity center -crop 400x100+0+0'}, :imagemagick => '/usr/bin/convert').make_screenshots
+      end
+      should 'create screenshots' do
+        [1,4].each do |sec|
+          assert File.exists? File.join(@output_dir, "scr00#{sec}.jpg")
+          assert File.exists? File.join(@output_dir, "scr00#{sec}_big.jpg")
+          assert File.exists? File.join(@output_dir, "scr00#{sec}_small.jpg")
+        end
       end
     end
   end
@@ -30,12 +50,33 @@ class VideoScreenshoterTest < Test::Unit::TestCase
       setup do
         @input = 'http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear4/prog_index.m3u8'
         @output_dir = '/tmp/hls_screenshots_test'
-        VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => ['10%', '50%', '-10%']).make_thumbnails
+        `rm -r  #{@output_dir}` if File.exists? @output_dir
       end
-      should 'create screenshots' do
-        ["scr1620.jpg", "scr180.jpg", "scr900.jpg"].each do |scr|
-          assert File.exists?(File.join(@output_dir, scr))
-          assert File.size(File.join(@output_dir, scr)) > 0
+      
+      context '' do
+        setup do
+          VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => ['10%', '50%', '-10%']).make_thumbnails
+        end
+        should 'create screenshots' do
+          ["scr1620.jpg", "scr180.jpg", "scr900.jpg"].each do |scr|
+            assert File.exists?(File.join(@output_dir, scr))
+            assert File.size(File.join(@output_dir, scr)) > 0
+          end
+        end
+      end
+
+      context 'with presets' do
+        setup do
+          VideoScreenshoter.imagemagick = '/usr/bin/convert'
+          VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :times => ['10%', '50%', '-10%'], :presets => {:big => '1024x768', :small => '140x100!'}).make_thumbnails
+        end
+        should 'create screenshots' do
+          ["scr1620.jpg", "scr180.jpg", "scr900.jpg"].each do |scr|
+            assert File.exists?(File.join(@output_dir, scr))
+            assert File.exists?(File.join(@output_dir, scr.sub('.jpg', '_big.jpg')))
+            assert File.exists?(File.join(@output_dir, scr.sub('.jpg', '_small.jpg')))
+          end
+          assert `/usr/local/bin/ffmpeg -i #{File.join(@output_dir, "scr900_small.jpg")} 2>&1`.include?('140x100')
         end
       end
     end

data/video_screenshoter.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "shoulda-context"
 
   spec.requirements << 'ffmpeg'
+  spec.requirements << 'imagemagick'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_screenshoter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2399110922537615442
+      hash: 1646458223958900487
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,9 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2399110922537615442
+      hash: 1646458223958900487
 requirements:
 - ffmpeg
+- imagemagick
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: