motion-capture 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a40129aa5ea8c985e6089e6db40906b56f00bb3c
-  data.tar.gz: 5b4726c722107daad383f37b2e520418beb3a5fa
+SHA256:
+  metadata.gz: ee51432dacdc318b8b687203b598709f6d69e549709f43390628e6ab6b4f6b7b
+  data.tar.gz: 7df7fe7e9d0fc9fa21cf315edd714213991e75e4ba34cbc0f27d0a83e983ec79
 SHA512:
-  metadata.gz: 473b932901836198ddc185c257435834fccfd9a709e3d6d47a5fc048ac18c725812da2b5d4df88d142263787be86fcd29f54bf50f1700b507eb4b918f53d211f
-  data.tar.gz: 988ce6e872578fe0df289dd76543a3bfb87de881d36e0c7a31b2481aad65a6f6ad29facc9c30f4487ba2c1e84a892abd8e0bb4f16998af41fd0fd314de64219b
+  metadata.gz: 89a3887fa974c95d0e2d37a3c36b90f842bc8d52d0f5e3a504df3e307759ca7bd2a62b7c7115305bc55b36d084955ce4a481cbc3292d0dc8bc47bcf5de22ef1c
+  data.tar.gz: 61c711ba4823f72564e0d21f86d21f4a8fc73f5846f0ffa9f6a9c0eb8c7b9aacbb11c2b1cdd2442b47f6a4a64f8b92353453ac180f4881d437eecf024f878da5

data/README.md

@@ -7,9 +7,9 @@ Camera support for custom camera controllers
 ``` ruby
 motion_capture = Motion::Capture.new
 motion_capture = Motion::Capture.new(device: :front) # specify camera
+motion_capture = Motion::Capture.new(preset: AVCaptureSessionPreset640x480) # specify a different preset (defaults to high resolution photo)
 
-preview = motion_capture.capture_preview_view(frame: view.bounds)
-view.addSubview(preview) # UIView containing AVCaptureVideoPreviewLayer
+motion_capture.attach(view) # apply a AVCaptureVideoPreviewLayer to the specified view
 
 motion_capture.toggle_camera # Switch between front/rear cameras
 motion_capture.toggle_flash  # Switch bettwen flash on/off
@@ -21,15 +21,34 @@ motion_capture.use_camera(:default)
 motion_capture.use_camera(:front)
 motion_capture.use_camera(:rear)
 
+# When you're ready to start the capture session:
+motion_capture.start!
+
+# Capturing Single Photos
+
 motion_capture.capture do |image_data|
   # Use NSData
 end
 
-motion_capture.capture_and_save do |asset_url|
-  # Use NSURL
+motion_capture.capture_image do |image|
+  # Use UIImage
+end
+
+# Saving captured images to the Photos library
+
+motion_capture.capture_and_save do |image_data, asset_url|
+  # Use NSData and NSURL
+end
+
+motion_capture.capture_image_and_save do |image, asset_url|
+  # Use UIImage and NSURL
 end
+
+# When you're done using the camera and are ready to stop the capture session:
+motion_capture.stop!
 ```
 
+
 ## Setup
 
 Add this line to your application's Gemfile:
@@ -44,6 +63,20 @@ Or install it yourself as:
 
     $ gem install motion-capture
 
+Add the necessary frameworks to your app configuration in your Rakefile:
+
+    app.frameworks << 'AVFoundation'
+    app.frameworks << 'Photos' # if you will be saving to the Photo library and targeting iOS 8+
+    app.frameworks << 'AssetsLibrary' # if you will be targeting iOS 4-7
+
+Then update your app configuration in your Rakefile to specify the message that will be displayed when asking the user for permission to use the camera:
+
+    app.info_plist['NSCameraUsageDescription'] = 'Camera will be used for taking your profile photo.'
+
+If you will be saving photos to the Photo Library, you will also need to specify the message that will be displayed to the user:
+
+    app.info_plist['NSPhotoLibraryUsageDescription'] = 'Photos taken will be saved to your library.'
+
 ## Contributing
 
 1. Fork it

data/lib/project/motion-capture.rb

@@ -8,18 +8,55 @@ module Motion; class Capture
     @options = options
   end
 
-  def on_error(block)
+  def on_error(&block)
     @error_callback = block
   end
 
-  def start!(preset = AVCaptureSessionPresetPhoto)
+  def start!
+    return if session.running?
+    if defined?(AVCapturePhotoOutput) # iOS 10+
+      @starting = true
+      authorize_camera do |success|
+        if success
+          Dispatch::Queue.new('motion-capture').async do
+            configure_session
+            session.startRunning
+            @starting = false
+          end
+        else
+          @starting = false
+        end
+      end
+    else # iOS 4-9
+      configure_session
+      session.startRunning
+    end
+  end
+
+  def authorize_camera(&block)
+    AVCaptureDevice.requestAccessForMediaType(AVMediaTypeVideo, completionHandler: -> (success) {
+      block.call(success)
+    })
+  end
+
+  def configure_session
+    session.beginConfiguration
+
+    set_preset(options.fetch(:preset, AVCaptureSessionPresetPhoto))
+
     use_camera(options.fetch(:device, :default))
 
-    set_preset(preset)
+    if defined?(AVCapturePhotoOutput) # iOS 10+
+      add_output(photo_output)
+    else # iOS 4-9
+      add_output(still_image_output)
+    end
 
-    add_ouput(still_image_output)
+    session.commitConfiguration
+  end
 
-    session.startRunning
+  def running?
+    @session && session.running?
   end
 
   def stop!
@@ -31,30 +68,66 @@ module Motion; class Capture
     preview_layer.removeFromSuperlayer if preview_layer && preview_layer.superlayer
 
     @still_image_output = nil
+    @photo_output       = nil
     @session            = nil
     @preview_layer      = nil
   end
 
-  def running?
-    @session && session.running?
+  def capture(&block)
+    if defined?(AVCapturePhotoOutput) # iOS 10+
+      Dispatch::Queue.new('motion-capture').async do
+        ensure_running_session do
+          update_video_orientation!
+          @capture_callback = block
+          capture_settings = AVCapturePhotoSettings.photoSettingsWithFormat(AVVideoCodecKey => AVVideoCodecJPEG)
+          photo_output.capturePhotoWithSettings(capture_settings, delegate: self)
+        end
+      end
+    else # iOS 4-9
+      still_image_output.captureStillImageAsynchronouslyFromConnection(still_image_connection, completionHandler: -> (buffer, error) {
+        if error
+          error_callback.call(error)
+        else
+          image_data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(buffer)
+          block.call(image_data)
+        end
+      })
+    end
   end
 
-  def capture(&block)
-    still_image_output.captureStillImageAsynchronouslyFromConnection(still_image_connection, completionHandler: -> (buffer, error) {
-      if error
-        error_callback.call(error)
-      else
-        image_data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(buffer)
+  def ensure_running_session(&block)
+    start! unless @starting || session.running?
+    while @starting || !session.running?
+      # wait for session to start...
+    end
+    block.call
+  end
 
-        block.call(image_data)
-      end
-    })
+  # iOS 11+ AVCapturePhotoCaptureDelegate method
+  def captureOutput(output, didFinishProcessingPhoto: photo, error: error)
+    if error
+      error_callback.call(error)
+    else
+      @capture_callback.call(photo.fileDataRepresentation)
+    end
+  end
+
+  # iOS 10 AVCapturePhotoCaptureDelegate method
+  def captureOutput(output, didFinishProcessingPhotoSampleBuffer: photo_sample_buffer, previewPhotoSampleBuffer: preview_photo_sample_buffer, resolvedSettings: resolved_settings, bracketSettings: bracket_settings, error: error)
+    if error
+      error_callback.call(error)
+    else
+      jpeg_data = AVCapturePhotoOutput.jpegPhotoDataRepresentation(
+        forJPEGSampleBuffer: photo_sample_buffer,
+        previewPhotoSampleBuffer: preview_photo_sample_buffer
+      )
+      @capture_callback.call(jpeg_data)
+    end
   end
 
   def capture_image(&block)
     capture do |jpeg_data|
       image = UIImage.imageWithData(jpeg_data)
-
       block.call(image)
     end
   end
@@ -71,18 +144,40 @@ module Motion; class Capture
     capture do |jpeg_data|
       save_data(jpeg_data) do |asset_url|
         image = UIImage.imageWithData(jpeg_data)
-
         block.call(image, asset_url)
       end
     end
   end
 
   def save_data(jpeg_data, &block)
+    if defined?(PHPhotoLibrary) # iOS 8+
+      save_to_photo_library(jpeg_data, &block)
+    else # iOS 4-8
+      save_to_assets_library(jpeg_data, &block)
+    end
+  end
+
+  # iOS 4-8
+  def save_to_assets_library(jpeg_data, &block)
     assets_library.writeImageDataToSavedPhotosAlbum(jpeg_data, metadata: nil, completionBlock: -> (asset_url, error) {
       error ? error_callback.call(error) : block.call(asset_url)
     })
   end
 
+  # iOS 8+
+  def save_to_photo_library(jpeg_data, &block)
+    photo_library.performChanges(-> {
+      image = UIImage.imageWithData(jpeg_data)
+      PHAssetChangeRequest.creationRequestForAssetFromImage(image)
+    }, completionHandler: -> (success, error) {
+      if error
+        error_callback.call(error)
+      else
+        block.call(nil) # asset url is not returned in completion block
+      end
+    })
+  end
+
   def attach(view, options = {})
     @preview_layer = preview_layer_for_view(view, options)
 
@@ -124,13 +219,14 @@ module Motion; class Capture
   end
 
   def preset
-    session.captureSession if @session
+    session.sessionPreset if @session
   end
 
   def flash
     device.flashMode if @device
   end
 
+  # iOS 4-9
   def set_flash(mode = :auto)
     configure_with_lock { device.flashMode = FLASH_MODES[mode] } if flash_mode_available?(mode)
   end
@@ -145,6 +241,7 @@ module Motion; class Capture
     @error_callback ||= -> (error) { p "An error occurred: #{error.localizedDescription}." }
   end
 
+  # iOS 4-9
   def still_image_connection
     still_image_output.connectionWithMediaType(AVMediaTypeVideo).tap do |connection|
       device_orientation = UIDevice.currentDevice.orientation
@@ -154,6 +251,16 @@ module Motion; class Capture
     end
   end
 
+  # iOS 10+
+  def update_video_orientation!
+    photo_output.connectionWithMediaType(AVMediaTypeVideo).tap do |connection|
+      device_orientation = UIDevice.currentDevice.orientation
+      video_orientation  = orientation_mapping.fetch(device_orientation, AVCaptureVideoOrientationPortrait)
+
+      connection.setVideoOrientation(video_orientation) if connection.videoOrientationSupported?
+    end
+  end
+
   def orientation_mapping
     { UIDeviceOrientationPortrait           => AVCaptureVideoOrientationPortrait,
       UIDeviceOrientationPortraitUpsideDown => AVCaptureVideoOrientationPortraitUpsideDown,
@@ -161,10 +268,16 @@ module Motion; class Capture
       UIDeviceOrientationLandscapeLeft      => AVCaptureVideoOrientationLandscapeRight }
   end
 
+  # iOS 4-8
   def assets_library
     @assets_library ||= ALAssetsLibrary.alloc.init
   end
 
+  # iOS 8+
+  def photo_library
+    @photo_library ||= PHPhotoLibrary.sharedPhotoLibrary
+  end
+
   def configure_with_lock(&block)
     error_pointer = Pointer.new(:object)
 
@@ -213,7 +326,7 @@ module Motion; class Capture
     session.addInput(input) if session.canAddInput(input)
   end
 
-  def add_ouput(output)
+  def add_output(output)
     session.addOutput(output) if session.canAddOutput(output)
   end
 
@@ -260,11 +373,16 @@ module Motion; class Capture
     @session ||= AVCaptureSession.alloc.init
   end
 
+  # iOS 4-9
   def still_image_output
     @still_image_output ||= AVCaptureStillImageOutput.alloc.init.tap do |output|
-      settings = { 'AVVideoCodeKey' => AVVideoCodecJPEG }
-
+      settings = { 'AVVideoCodecKey' => AVVideoCodecJPEG }
       output.setOutputSettings(settings)
     end
   end
+
+  # iOS 10+
+  def photo_output
+    @photo_output ||= AVCapturePhotoOutput.alloc.init
+  end
 end; end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: motion-capture
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Devon Blandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Easily create custom camera controllers
@@ -44,17 +44,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: RubyMotion AVFoundation wrapper