Exposed camera properties to allow exposure locking, added transforms…

… to movie outputs.
BradLarson · Oct 16, 2018 · 20ab871 · 20ab871
1 parent d0f8f5d
commit 20ab871
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/framework/Source/Mac/Camera.swift b/framework/Source/Mac/Camera.swift
@@ -24,7 +24,7 @@ public class Camera: NSObject, ImageSource, AVCaptureVideoDataOutputSampleBuffer
 
     public let targets = TargetContainer()
     let captureSession:AVCaptureSession
-    let inputCamera:AVCaptureDevice
+    public let inputCamera:AVCaptureDevice
     let videoInput:AVCaptureDeviceInput!
     let videoOutput:AVCaptureVideoDataOutput!
     var microphone:AVCaptureDevice?

diff --git a/framework/Source/Mac/MovieOutput.swift b/framework/Source/Mac/MovieOutput.swift
@@ -22,6 +22,15 @@ public class MovieOutput: ImageConsumer, AudioEncodingTarget {
     private var previousAudioTime = kCMTimeNegativeInfinity
     private var encodingLiveVideo:Bool
 
+    var transform:CGAffineTransform {
+        get {
+            return assetWriterVideoInput.transform
+        }
+        set {
+            assetWriterVideoInput.transform = transform
+        }
+    }
+
     public init(URL:Foundation.URL, size:Size, fileType:AVFileType = .mov, liveVideo:Bool = false, settings:[String:AnyObject]? = nil) throws {
         self.size = size
         assetWriter = try AVAssetWriter(url:URL, fileType:fileType)
@@ -52,7 +61,10 @@ public class MovieOutput: ImageConsumer, AudioEncodingTarget {
         assetWriter.add(assetWriterVideoInput)
     }
 
-    public func startRecording() {
+    public func startRecording(transform:CGAffineTransform? = nil) {
+        if let transform = transform {
+            assetWriterVideoInput.transform = transform
+        }
         startTime = nil
         sharedImageProcessingContext.runOperationSynchronously{
             self.isRecording = self.assetWriter.startWriting()

diff --git a/framework/Source/iOS/Camera.swift b/framework/Source/iOS/Camera.swift
@@ -66,7 +66,7 @@ public class Camera: NSObject, ImageSource, AVCaptureVideoDataOutputSampleBuffer
     public let targets = TargetContainer()
     public var delegate: CameraDelegate?
     public let captureSession:AVCaptureSession
-    let inputCamera:AVCaptureDevice!
+    public let inputCamera:AVCaptureDevice!
     let videoInput:AVCaptureDeviceInput!
     let videoOutput:AVCaptureVideoDataOutput!
     var microphone:AVCaptureDevice?

diff --git a/framework/Source/iOS/MovieOutput.swift b/framework/Source/iOS/MovieOutput.swift
@@ -26,6 +26,15 @@ public class MovieOutput: ImageConsumer, AudioEncodingTarget {
     var pixelBuffer:CVPixelBuffer? = nil
     var renderFramebuffer:Framebuffer!
 
+    var transform:CGAffineTransform {
+        get {
+            return assetWriterVideoInput.transform
+        }
+        set {
+            assetWriterVideoInput.transform = transform
+        }
+    }
+
     public init(URL:Foundation.URL, size:Size, fileType:AVFileType = AVFileType.mov, liveVideo:Bool = false, settings:[String:AnyObject]? = nil) throws {
         if sharedImageProcessingContext.supportsTextureCaches() {
             self.colorSwizzlingShader = sharedImageProcessingContext.passthroughShader
@@ -62,7 +71,10 @@ public class MovieOutput: ImageConsumer, AudioEncodingTarget {
         assetWriter.add(assetWriterVideoInput)
     }
 
-    public func startRecording() {
+    public func startRecording(transform:CGAffineTransform? = nil) {
+        if let transform = transform {
+            assetWriterVideoInput.transform = transform
+        }
         startTime = nil
         sharedImageProcessingContext.runOperationSynchronously{
             self.isRecording = self.assetWriter.startWriting()