SCContext are loaded lazily to improve SCImageView and SCFilterSelect…

…orView instantiation speed.
rFlex · May 29, 2015 · afde95a · afde95a
1 parent 95c6a69
commit afde95a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 13 deletions.
diff --git a/Library/Sources/SCContext.h b/Library/Sources/SCContext.h
@@ -14,4 +14,6 @@
 @property (readonly, nonatomic) CIContext *CIContext;
 @property (readonly, nonatomic) EAGLContext *EAGLContext;
 
++ (SCContext *)context;
+
 @end
diff --git a/Library/Sources/SCContext.m b/Library/Sources/SCContext.m
@@ -11,17 +11,31 @@
 @implementation SCContext
 
 - (id)init {
+    return [self initWithSharegroup:nil];
+}
+
+- (id)initWithSharegroup:(EAGLSharegroup *)shareGroup {
     self = [super init];
 
     if (self) {
-        _EAGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+        _EAGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:shareGroup];
 
         NSDictionary *options = @{ kCIContextWorkingColorSpace : [NSNull null], kCIContextOutputColorSpace : [NSNull null] };
-
+        
         _CIContext = [CIContext contextWithEAGLContext:_EAGLContext options:options];
     }
 
     return self;
 }
 
++ (SCContext *)context {
+    static dispatch_once_t onceToken;
+    static EAGLSharegroup *shareGroup;
+    dispatch_once(&onceToken, ^{
+        shareGroup = [EAGLSharegroup new];
+    });
+
+    return [[SCContext alloc] initWithSharegroup:shareGroup];
+}
+
 @end
diff --git a/Library/Sources/SCFilterSelectorView.m b/Library/Sources/SCFilterSelectorView.m
@@ -33,20 +33,24 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
 }
 
 - (void)commonInit {
-    SCContext *context = [SCContext new];
-    EAGLContext *EAGLContext = context.EAGLContext;
-    _glkView = [[GLKView alloc] initWithFrame:self.bounds context:EAGLContext];
+    _glkView = [[GLKView alloc] initWithFrame:self.bounds context:nil];
     _glkView.backgroundColor = [UIColor clearColor];
 
-    _CIContext = context.CIContext;
-
     _glkView.delegate = self;
 
     _sampleBufferHolder = [SCSampleBufferHolder new];
 
     [self addSubview:_glkView];
 }
 
+- (void)_loadContext {
+    if (_CIContext == nil) {
+        SCContext *context = [SCContext context];
+        _CIContext = context.CIContext;
+        _glkView.context = context.EAGLContext;
+    }
+}
+
 - (void)layoutSubviews {
     [super layoutSubviews];
 
@@ -138,6 +142,10 @@ - (UIImage *)currentlyDisplayedImageWithScale:(CGFloat)scale orientation:(UIImag
 
 - (void)setCIImage:(CIImage *)CIImage {
     _CIImage = CIImage;
+
+    if (CIImage != nil) {
+        [self _loadContext];
+    }
     [_glkView setNeedsDisplay];
 }
 

diff --git a/Library/Sources/SCImageView.m b/Library/Sources/SCImageView.m
@@ -43,13 +43,17 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
 - (void)commonInit {
     self.preferredCIImageTransform = CGAffineTransformIdentity;
 
-    SCContext *context = [SCContext new];
-    _CIContext = context.CIContext;
-    self.context = context.EAGLContext;
-
     _sampleBufferHolder = [SCSampleBufferHolder new];
 }
 
+- (void)_loadContext {
+    if (_CIContext == nil) {
+        SCContext *context = [SCContext context];
+        _CIContext = context.CIContext;
+        self.context = context.EAGLContext;
+    }
+}
+
 - (void)drawRect:(CGRect)rect {
     glClearColor(0, 0, 0, 1);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -78,6 +82,7 @@ - (void)drawRect:(CGRect)rect {
 
 - (void)setImageBySampleBuffer:(CMSampleBufferRef)sampleBuffer {
     _sampleBufferHolder.sampleBuffer = sampleBuffer;
+
     [self setNeedsDisplay];
 }
 
@@ -88,6 +93,10 @@ - (void)setImageByUIImage:(UIImage *)image {
 - (void)setCIImage:(CIImage *)CIImage {
     _CIImage = CIImage;
 
+    if (CIImage != nil) {
+        [self _loadContext];
+    }
+
     [self setNeedsDisplay];
 }
 

diff --git a/SCRecorder.podspec b/SCRecorder.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SCRecorder"
-  s.version      = "2.4.3"
+  s.version      = "2.4.5"
   s.summary      = "The camera engine that is complete, for real."
 
   s.description  = <<-DESC
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.license      = 'Apache License, Version 2.0'
   s.author             = { "Simon CORSIN" => "[email protected]" }
   s.platform     = :ios, '6.0'
-  s.source       = { :git => "https://github.com/rFlex/SCRecorder.git", :tag => "v2.4.3" }
+  s.source       = { :git => "https://github.com/rFlex/SCRecorder.git", :tag => "v2.4.5" }
   s.source_files  = 'Library/Sources/*.{h,m}'
   s.public_header_files = 'Library/Sources/*.h'
   s.requires_arc = true