motion-capture 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 098882fee3cdac39ac683f6add7df21009187b01
-  data.tar.gz: 95a133286c70f6bab31ce7410056046df6ed2231
+  metadata.gz: d2ea866d57338e676627eaa74c23c490d6e8fd06
+  data.tar.gz: 0f31ebdf4127769dbfac818379cb5372e45f870e
 SHA512:
-  metadata.gz: 1957c4720f94d8fb3aaf998535a6865fa2b98d37daed7469703920f21167b15b64a029607644345c350d9477584cff1a2524707d76f08997b9e3496411bc06ce
-  data.tar.gz: ec63205dae5efc7e59eecbdc569f07b91c99c862dd47952446c5964bdb1ea18e733b19c789d5dbc9a0ac5bd02c72ed2b997cb3bd222f499949964b1feb219e25
+  metadata.gz: e5e8c4a930c9b6cc47e7479b0ddd84cc186ae717a8dc27f850c4e544fff6c48d43d4ba15d0c5d5a3d8a3a212bd65da00166c17fc010e6adc92d3b5e66167502c
+  data.tar.gz: d719496998b5a1f5d80ba12da71d9a8dff5265d7ece8c37feb262d719cb19ef592e60d66bfa412e3684a606cb84036dcc95cece83dd51b06e4df3082426710a5

data/README.md

@@ -4,25 +4,31 @@ Camera support for custom camera controllers
 
 ## Usage
 
-    motion_capture = Motion::Capture.new
-    motion_capture = Motion::Capture.new(device: :front) # specify camera
+``` ruby
+motion_capture = Motion::Capture.new
+motion_capture = Motion::Capture.new(device: :front) # specify camera
 
-    preview = motion_capture.capture_preview_view(frame: view.bounds)
-    view.addSubview(preview) # UIView containing AVCaptureVideoPreviewLayer
+preview = motion_capture.capture_preview_view(frame: view.bounds)
+view.addSubview(preview) # UIView containing AVCaptureVideoPreviewLayer
 
-    motion_capture.toggle_camera # Switch between front/rear cameras
-    motion_capture.toggle_flash  # Switch bettwen flash on/off
+motion_capture.toggle_camera # Switch between front/rear cameras
+motion_capture.toggle_flash  # Switch bettwen flash on/off
 
-    motion_capture.turn_flash_on
-    motion_capture.turn_flash_off
+motion_capture.turn_flash_on
+motion_capture.turn_flash_off
 
-    motion_capture.use_camera(:default)
-    motion_capture.use_camera(:front)
-    motion_capture.use_camera(:rear)
+motion_capture.use_camera(:default)
+motion_capture.use_camera(:front)
+motion_capture.use_camera(:rear)
 
-    motion_capture.capture do |image|
-      # Use UIImage
-    end
+motion_capture.capture do |image_data|
+  # Use NSData
+end
+
+motion_capture.capture_and_save do |asset_url|
+  # Use NSURL
+end
+```
 
 ## Setup
 

data/lib/project/motion-capture.rb

@@ -14,22 +14,59 @@ class Motion
       add_ouput(still_image_output)
     end
 
+    def stop!
+      session.stopRunning
+
+      remove_outputs
+      remove_inputs
+
+      @_still_image_output = nil
+      @_session = nil
+      @_capture_preview_view = nil
+    end
+
     def capture(&block)
-      still_image_connection = still_image_output.connections.first
+      still_image_connection = still_image_output.connectionWithMediaType(AVMediaTypeVideo)
+
+      if still_image_connection.isVideoOrientationSupported
+        still_image_connection.setVideoOrientation(UIDevice.currentDevice.orientation)
+      end
 
       still_image_output.captureStillImageAsynchronouslyFromConnection(still_image_connection, completionHandler: lambda { |image_data_sample_buffer, error|
         if image_data_sample_buffer
           image_data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(image_data_sample_buffer)
 
-          image = UIImage.alloc.initWithData(image_data)
+          block.call(image_data)
+        else
+          p "Error capturing image: #{error.localizedDescription}"
+        end
+      })
+    end
+
+    def capture_and_save(&block)
+      still_image_connection = still_image_output.connectionWithMediaType(AVMediaTypeVideo)
+
+      if still_image_connection.isVideoOrientationSupported
+        still_image_connection.setVideoOrientation(UIDevice.currentDevice.orientation)
+      end
+
+      still_image_output.captureStillImageAsynchronouslyFromConnection(still_image_connection, completionHandler: lambda { |image_data_sample_buffer, error|
+        if image_data_sample_buffer
+          image_data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(image_data_sample_buffer)
 
-          block.call(image)
+          assets_library.writeImageDataToSavedPhotosAlbum(image_data, metadata: nil, completionBlock: lambda { |asset_url, error|
+            block.call(asset_url)
+          })
         else
-          p "Error capturing image: #{error[0].description}"
+          p "Error capturing image: #{error.localizedDescription}"
         end
       })
     end
 
+    def assets_library
+      @_assets_library ||= ALAssetsLibrary.alloc.init
+    end
+
     def capture_preview_view(options)
       @_capture_preview_view ||= begin
         start!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-capture
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Devon Blandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,6 @@ files:
 - README.md
 - lib/motion-capture.rb
 - lib/project/motion-capture.rb
-- lib/project/views/overlay_view.rb
 homepage: https://github.com/dblandin/motion-capture
 licenses:
 - MIT

data/lib/project/views/overlay_view.rb

@@ -1,112 +0,0 @@
-class GridOverlayView < UIView
-  DEFAULTS = { stroke_color: UIColor.grayColor,
-               stroke_width: 1.0,
-               x_lines: 3,
-               y_lines: 3 }
-
-  attr_accessor :x_interval, :y_interval
-  attr_reader   :stroke_color, :stroke_width
-
-  def initWithFrame(frame)
-    super.tap do |view|
-      view.backgroundColor = UIColor.clearColor
-
-      self.x_lines      = DEFAULTS[:x_lines]
-      self.y_lines      = DEFAULTS[:y_lines]
-      self.stroke_color = DEFAULTS[:stroke_color]
-      self.stroke_width = DEFAULTS[:stroke_width]
-    end
-  end
-
-  def hidden?
-    stroke_color == UIColor.clearColor
-  end
-
-  def toggle
-    if hidden?
-      show
-    else
-      hide
-    end
-  end
-
-  def show
-    self.stroke_color = @original_color
-
-    setNeedsDisplay
-  end
-
-  def hide
-    unless hidden?
-      @original_color = stroke_color
-
-      self.stroke_color = UIColor.clearColor
-
-      setNeedsDisplay
-    end
-  end
-
-  def x_lines=(lines)
-    self.x_interval = frame.size.width / lines
-
-    setNeedsDisplay
-  end
-
-  def y_lines=(lines)
-    self.y_interval = frame.size.height / lines
-
-    setNeedsDisplay
-  end
-
-  def stroke_width=(width)
-    @stroke_width = width
-
-    setNeedsDisplay
-  end
-
-  def stroke_color=(color)
-    @stroke_color = color
-
-    setNeedsDisplay
-  end
-
-  def setup_drawing
-    CGContextSetStrokeColorWithColor(context, stroke_color.CGColor)
-
-    CGContextSetLineWidth(context, stroke_width)
-  end
-
-  def drawRect(rect)
-    super
-
-    setup_drawing
-    draw_vertical_lines
-    draw_horizontal_lines
-
-    fill_path
-  end
-
-  def fill_path
-    CGContextStrokePath(context)
-  end
-
-  def draw_horizontal_lines
-    draw_line([0, y_interval],     [size.width, y_interval])
-    draw_line([0, y_interval * 2], [size.width, y_interval * 2])
-  end
-
-  def draw_vertical_lines
-    draw_line([x_interval, 0],     [x_interval, size.height])
-    draw_line([x_interval * 2, 0], [x_interval * 2.0, size.height])
-  end
-
-  def draw_line(start_point, end_point)
-    CGContextMoveToPoint(context, start_point[0], start_point[1])
-
-    CGContextAddLineToPoint(context, end_point[0], end_point[1])
-  end
-
-  def context
-    @_context ||= UIGraphicsGetCurrentContext()
-  end
-end