#264

shogo4405 · Sep 17, 2017 · 821b303 · 821b303
1 parent 050c1fa
commit 821b303
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/Sources/Media/AVMixer.swift b/Sources/Media/AVMixer.swift
@@ -119,9 +119,6 @@ extension AVMixer: Runnable {
         guard !running else {
             return
         }
-        if let factory:CIContextFactory = videoIO.contextFactory {
-            videoIO.context = factory()
-        }
         DispatchQueue.global(qos: .userInteractive).async {
             self.session.startRunning()
         }

diff --git a/Sources/Media/VideoIOComponent.swift b/Sources/Media/VideoIOComponent.swift
@@ -2,8 +2,6 @@ import CoreImage
 import Foundation
 import AVFoundation
 
-public typealias CIContextFactory = () -> CIContext
-
 final class VideoIOComponent: IOComponent {
     let lockQueue:DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.VideoIOComponent.lock")
     var context:CIContext?
@@ -22,7 +20,6 @@ final class VideoIOComponent: IOComponent {
     }()
 
     var effects:[VisualEffect] = []
-    var contextFactory:CIContextFactory?
 
 #if os(iOS) || os(macOS)
     var fps:Float64 = AVMixer.defaultFPS {

diff --git a/Sources/Net/NetStream.swift b/Sources/Net/NetStream.swift
@@ -23,12 +23,13 @@ open class NetStream: NSObject {
     }
 
     open var metadata:[String: Any?] = [:]
-    open var contextFactory:CIContextFactory? {
+
+    open var context:CIContext? {
         get {
-            return mixer.videoIO.contextFactory
+            return mixer.videoIO.context
         }
         set {
-            mixer.videoIO.contextFactory = contextFactory
+            mixer.videoIO.context = context
         }
     }