puremotion 0.0.1 → 0.1.0

data/lib/puremotion.rb

@@ -1,22 +1,30 @@
 req = File.expand_path(File.dirname(__FILE__)) + '/'
 
-require 'rubygems'
+#require 'rubygems'
 
 module PureMotion
   
 end
 
-require req + 'puremotion/events/event'
-require req + 'puremotion/events/generator'
+require req + 'puremotion_native'
+require req + 'events/event'
+require req + 'events/generator'
 
 Object.extend(PureMotion::Events::Generator)
 
-require req + 'puremotion/thread'
-require req + 'puremotion/media'
-require req + 'puremotion/media/stream'
-require req + 'puremotion/media/stream/base'
-require req + 'puremotion/media/stream/video'
-require req + 'puremotion/codecs'
-require req + 'puremotion/transcode/transcode'
-require req + 'puremotion/transcode/recipe'
-require req + 'puremotion/tools/ffmpeg'
+require req + 'preset/preset'
+
+require req + 'preset/general'
+require req + 'preset/file'
+require req + 'preset/metadata'
+require req + 'preset/video/video'
+require req + 'preset/video/crop'
+require req + 'preset/video/pad'
+require req + 'preset/audio/audio'
+
+
+require req + 'threading'
+require req + 'media'
+require req + 'codecs'
+require req + 'transcode/transcode'
+require req + 'tools/ffmpeg'

data/lib/threading.rb

@@ -0,0 +1,54 @@
+# Author:: Jared Kuolt (mailto:me@superjared.com)
+# Copyright:: Copyright (c) 2009 Jared Kuolt
+# License:: MIT License
+#
+# See README.rdoc[link:files/README_rdoc.html] for usage
+#
+
+module PureMotion
+  class Thread
+
+    attr_reader :thread, :exception
+    attr_accessor :name
+  
+    def initialize(config={}, &block)
+      args = (config[:args] or [])
+      self.class.init_exit_handler
+      @thread = ::Thread.new(*args) do |*targs|
+        begin
+          block.call(*targs)
+        rescue Exception => e
+          @exception = e
+          # Handle?
+        end
+      end
+      self.name = config[:name] || @thread.inspect
+      self.class.threads << self
+      self.class.init_exit_handler
+    end
+
+    class << self
+      attr_accessor :logger, :exit_thread, :exit_handler_initialized, :callbacks
+
+      def threads
+        @threads ||= []
+      end
+  
+      def init_exit_handler
+        return if self.exit_handler_initialized
+        self.exit_thread = false
+        at_exit do
+          self.exit_thread = true
+          begin
+            self.threads.each do |thread|
+              thread.thread.join
+            end
+          rescue Interrupt
+          end
+        end
+        self.exit_handler_initialized = true
+      end
+  
+    end
+  end
+end

data/lib/{puremotion/tools → tools}/ffmpeg.rb

@@ -12,7 +12,8 @@ module PureMotion::Tools
       ERROR             = 32
       
     end
-    
+
+    attr_reader :pid
     attr_reader :args
     attr_accessor :output
     
@@ -20,12 +21,8 @@ module PureMotion::Tools
     event :complete
     event :exited
     event :status_change
-    
-    @status = Status::NOT_STARTED
-    
-    def self.run(args = {})
-      FFmpeg.new( args )
-    end
+
+    @pid = nil
     
     def initialize(params = {})
       if params.class != Hash then raise ArgumentError, "Invalid parameters" end
@@ -44,17 +41,15 @@ module PureMotion::Tools
       end
       
       @output = []
-      
-      go
     end
     
-    def go
-      
-      @pio = IO.popen("ffmpeg #{@options} 2>&1")
-      
+    def run
+
       temp = ''
       
-      PureMotion::Thread.new do
+      @thread = PureMotion::Thread.new do
+        @pio = IO.popen("ffmpeg #{@options} 2>&1")
+        @pid = @pio.pid
         @pio.each_byte do |l|
           if l == 10 or l == 13 then
             @output.push temp
@@ -70,6 +65,9 @@ module PureMotion::Tools
         if @pio.eof? then
           @done = true
           complete(true)
+          @pid = nil
+          @pio.close
+          exited(true)
         end
       end
     
@@ -78,7 +76,6 @@ module PureMotion::Tools
     def ran?
       @pio.eof? unless @pio.nil?
       false
-      #!find(/^FFmpeg/).nil?
     end
     
     def ended?
@@ -101,41 +98,6 @@ module PureMotion::Tools
       @status
     end
     
-    private
-    
-    def prepare_args
-      @args = []
-      @args << ['i', @input]
-      
-      args = []
-    
-      strings = []
-    
-      @args.each do |arg, value|
-        if value.nil? then value = '' end
-        value = '"' + value.to_s + '"' unless value.index(' ').nil?
-        
-        args << [ arg, value]
-        
-        if value.empty? or value =~ /^\s*$/ then
-          value = ''
-        else
-          value = ' ' << value
-        end
-        
-        strings << ( '-' << arg << value )
-      end
-      
-      if !@output.nil? then strings << '"' + @output + '"' end
-      
-      @args = strings.join(' ')
-    end
-    
-    def status=(status_const)
-      @status = status_const
-      status_change(status_const)
-    end
-    
   end
   
 end

data/lib/transcode/transcode.rb

@@ -0,0 +1,142 @@
+def Transcode(*args, &block)
+
+  raise ArgumentError, "No block given for transcode preset" unless block_given?
+
+  preset = PureMotion::Preset.new(:dsl)
+  preset.instance_eval(&block)
+
+  options = {
+    :input => preset.input,
+    :output => preset.output,
+    :preset => preset
+  }
+
+  options[:log] = preset.log unless preset.log.nil?
+
+  transcode = PureMotion::Transcode::Transcode.new(options)
+
+  transcode.run
+
+  return transcode
+
+end
+
+module PureMotion::Transcode
+  
+  class Transcode < Object
+
+    event :progress
+    event :complete
+    event :output
+    
+    @ffmpeg = nil
+    @input = nil
+    
+    def initialize(options)
+      
+      default_options = {
+        :output => nil,
+        :preset => nil,
+        :input => nil
+      }
+      
+      raise ArgumentError, "Invalid transcode parameters given" unless options.is_a?(Hash)
+      
+      options = default_options.merge(options)
+      
+      raise ArgumentError, "No output file given" if options[:output].nil?
+
+      if options[:input].is_a?(String) then
+        @input = PureMotion::Media.new(options[:input])
+      else
+        @input = options[:input]
+      end
+      @preset = options[:preset]
+      @output = options[:output]
+
+      validate
+
+      wire_events
+
+      if options[:log] then
+        @log = File.new(options[:log], 'w')
+        self.output + lambda do |t, line|
+          @log.puts line
+        end
+        self.complete + lambda do |t, complete|
+          @log.close
+        end
+      end
+      
+      # Raise error if output file exists and overwrite not set
+      
+      @ffmpeg = PureMotion::Tools::FFmpeg.new(:options => @preset.arguments)
+	
+      @ffmpeg.line + lambda do |ffmpeg, line|
+        handle_output line
+      end
+
+      @ffmpeg.exited + lambda do |ffmpeg, exited|
+        complete(true)
+      end
+      
+    end
+    
+    def run
+      @ffmpeg.run
+    end
+    
+    def cancel
+      # TODO : Implement
+    end
+    
+    def cancel!
+      # TODO : Implement - kill process dead
+    end
+    
+    private
+    
+    def handle_output line
+      output line
+      # /^frame=\s*(?<frame>\d*)\s*fps=\s*(?<fps>\d*)\s*q=(?<q>\S*)\s*size=\s*(?<size>[\d]*)(?<size_unit>[kmg]B)\s*time=\s*(?<time>[\d.]*)\s*bitrate=\s*(?<bitrate>[\d.]*)(?<bitrate_unit>[km]b).*$/
+      progress_line = /frame=\s*(\d*)\s*fps=\s*(\d*)\s*q=(\S*)\s*[L]?size=\s*([\d]*)([kmg]B)\s*time=\s*([\d.]*)\s*bitrate=\s*([\d.]*)([km]b)/
+      # The regex is documentated above and the matches it should give below
+      # 1 => frame
+      # 2 => fps
+      # 3 => q
+      # 4 => size
+      # 5 => size_unit
+      # 6 => time
+      # 7 => bitrate
+      # 8 => bitrate_unit
+      handle_progress(progress_line.match(line)) if progress_line.match(line)
+    end
+    
+    def handle_progress line
+      if line[4].to_i == 0 then return false end
+      p = {
+        :frame    => line[1].to_i,
+        :fps      => line[2].to_i,
+        :q        => line[3].to_f,
+        :size     => line[4].to_i,
+        :time     => line[6].to_f,
+        :bitrate  => line[7].to_f,
+        :percent  => ((100.00 / @input.duration) * line[6].to_f).to_i
+      }
+      p[:percent] = 100 if p[:percent] > 100 unless p[:percent].nil?
+      progress(p)
+    end
+    
+    def validate
+      
+    end
+
+    def wire_events
+      self.complete += @preset.event_handlers[:complete] unless @preset.event_handlers[:complete].nil?
+      self.progress += @preset.event_handlers[:progress] unless @preset.event_handlers[:progress].nil?
+    end
+
+  end
+  
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'puremotion'
+
+def sample_path
+  ::File.expand_path(::File.join(::File.dirname(__FILE__), "samples", "sample.ogv"))
+end

data/spec/units/media_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe PureMotion::Media do
+
+  it "should read supported formats" do
+    lambda do
+      PureMotion::Media.new(sample_path)
+    end.should_not raise_error
+  end
+
+
+
+end

data/spec/units/preset_spec.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe PureMotion::Preset do
+
+  it "should support all possible inputs" do
+    begin
+    PureMotion::Preset.build do
+
+      input sample_path
+
+      overwrite!
+
+      seek 2
+      duration 10
+
+      file do
+
+        size_limit 10_000_000
+
+      end
+
+      metadata do
+
+        title "Test"
+        author "Me"
+        copyright "None whatsoever"
+        album "Test"
+        track 2
+        comment "Brilliant"
+        year 1989
+
+      end
+
+      video do
+
+        disable
+
+        buffer '200'
+
+        bitrate '300k'
+        bitrate 300
+
+        same_quality
+
+        frames 100
+
+        framerate 25
+        fps 25
+
+        resolution 320, 240
+        resolution [320, 240]
+        resolution '320x240'
+        resolution :vga
+
+        crop do
+          top 10
+          bottom 20
+          left 30
+          right 40
+        end
+
+        pad do
+          top 40
+          bottom 30
+          left 20
+          right 10
+
+          color "333333"
+        end
+
+      end
+
+      audio do
+
+        disable
+
+        channels 2
+        sampling 44100
+        frames 100
+
+        language :eng
+
+      end
+
+      output "output.mp4"
+
+    end
+    end.should_not raise_error
+  end
+
+end