Fix photo using surface crash.

Vladislav Grigoryev · Vladislav Grigoryev · commit 4d6fb7844ca0 · 2020-11-02T16:22:21.000+03:00
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -438,7 +438,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "gora.studio.SCNRecorder.Example.${DEVELOPMENT_TEAM}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -459,7 +459,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "gora.studio.SCNRecorder.Example.${DEVELOPMENT_TEAM}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - SCNRecorder (2.1.2)
+  - SCNRecorder (2.1.3)
 
 DEPENDENCIES:
   - SCNRecorder (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  SCNRecorder: 8fb988232b1ba508d36e64d743960ec259d67a35
+  SCNRecorder: d3ee579c3c4511774300689840b82cb4b7a9143f
 
 PODFILE CHECKSUM: e392a018caa1209a22fbb64a189d92975244c2bf
 
diff --git a/Example/Pods/Local Podspecs/SCNRecorder.podspec.json b/Example/Pods/Local Podspecs/SCNRecorder.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/SCNRecorder/SCNRecorder-Info.plist b/Example/Pods/Target Support Files/SCNRecorder/SCNRecorder-Info.plist
diff --git a/SCNRecorder.podspec b/SCNRecorder.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'SCNRecorder'
-  s.version               = '2.1.2'
+  s.version               = '2.1.3'
   s.summary               = 'A lags-free recorder of ARKit and SceneKit for iOS in Swift'
   s.homepage              = 'https://github.com/gorastudio/SCNRecorder'
   s.license               = { :type => 'MIT', :file => 'LICENSE.md' }
diff --git a/SCNRecorder.xcodeproj/project.pbxproj b/SCNRecorder.xcodeproj/project.pbxproj
@@ -820,7 +820,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.3;
 				MODULEMAP_FILE = SCNRecorder.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = gora.studio.SCNRecorder;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -848,7 +848,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.3;
 				MODULEMAP_FILE = SCNRecorder.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = gora.studio.SCNRecorder;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
diff --git a/Sources/MediaSession/MediaSession.swift b/Sources/MediaSession/MediaSession.swift
@@ -189,8 +189,11 @@ extension MediaSession {
   }
 
   func takeCoreImage(completionHandler handler: @escaping (CIImage) -> Void) {
+    guard let videoInput = videoInput else { return }
+
     addVideoOutput(
       ImageOutput.takeCIImage(
+        context: videoInput.context,
         completionHandler: { [weak self] in
           self?.removeVideoOutput($0)
           handler($1)
diff --git a/Sources/Outputs/ImageOutput/ImageOutput.swift b/Sources/Outputs/ImageOutput/ImageOutput.swift
@@ -26,6 +26,7 @@
 import Foundation
 import AVFoundation
 import UIKit
+import VideoToolbox
 
 final class ImageOutput {
 
@@ -40,20 +41,23 @@ final class ImageOutput {
     }
   }
 
-  static func takeCGImage(
+  static func takeCIImage(
     context: CIContext,
-    completionHandler handler: @escaping (ImageOutput, CGImage) -> Void
+    completionHandler handler: @escaping (ImageOutput, CIImage) -> Void
   ) -> ImageOutput {
-    takeCIImage {
-      handler($0, context.createCGImage($1, from: $1.extent)!)
+    takeCGImage(context: context) {
+      handler($0, CIImage(cgImage: $1))
     }
   }
 
-  static func takeCIImage(
-    completionHandler handler: @escaping (ImageOutput, CIImage) -> Void
+  static func takeCGImage(
+    context: CIContext,
+    completionHandler handler: @escaping (ImageOutput, CGImage) -> Void
   ) -> ImageOutput {
     takePixelBuffer {
-      handler($0, CIImage(cvPixelBuffer: $1))
+      var image: CGImage?
+      VTCreateCGImageFromCVPixelBuffer($1, options: nil, imageOut: &image)
+      handler($0, image!)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import Foundation`
`27`	`27`	`import AVFoundation`
`28`	`28`	`import UIKit`
	`29`	`+import VideoToolbox`
`29`	`30`
`30`	`31`	`final class ImageOutput {`
`31`	`32`
`@@ -40,20 +41,23 @@ final class ImageOutput {`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`43`		`- static func takeCGImage(`
	`44`	`+ static func takeCIImage(`
`44`	`45`	`context: CIContext,`
`45`		`- completionHandler handler: @escaping (ImageOutput, CGImage) -> Void`
	`46`	`+ completionHandler handler: @escaping (ImageOutput, CIImage) -> Void`
`46`	`47`	`) -> ImageOutput {`
`47`		`- takeCIImage {`
`48`		`- handler($0, context.createCGImage($1, from: $1.extent)!)`
	`48`	`+ takeCGImage(context: context) {`
	`49`	`+ handler($0, CIImage(cgImage: $1))`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`
`52`		`- static func takeCIImage(`
`53`		`- completionHandler handler: @escaping (ImageOutput, CIImage) -> Void`
	`53`	`+ static func takeCGImage(`
	`54`	`+ context: CIContext,`
	`55`	`+ completionHandler handler: @escaping (ImageOutput, CGImage) -> Void`
`54`	`56`	`) -> ImageOutput {`
`55`	`57`	`takePixelBuffer {`
`56`		`- handler($0, CIImage(cvPixelBuffer: $1))`
	`58`	`+ var image: CGImage?`
	`59`	`+ VTCreateCGImageFromCVPixelBuffer($1, options: nil, imageOut: &image)`
	`60`	`+ handler($0, image!)`
`57`	`61`	`}`
`58`	`62`	`}`
`59`	`63`