SWF-16337: switch from filter offset to direct filter type

smule · Jul 7, 2017 · 09ac8f4 · 09ac8f4
1 parent 126f10e
commit 09ac8f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/Source/PBJVision.h b/Source/PBJVision.h
@@ -126,8 +126,7 @@ static CGFloat const PBJVideoBitRate1280x750 = 5000000 * 8;     // 40bmps
 
 + (PBJVision *)sharedInstance;
 
-// Swipe offset so we can get the correct filter
-@property CGFloat filterOffset;
+- (void)setCurrentFilterType:(VideoFilterType)filterType;
 
 @property (nonatomic, weak) id<PBJVisionDelegate> delegate;
 
@@ -223,9 +222,6 @@ static CGFloat const PBJVideoBitRate1280x750 = 5000000 * 8;     // 40bmps
 @property (nonatomic, getter=isAudioCaptureEnabled) BOOL audioCaptureEnabled;
 @property (nonatomic) CGFloat screenScale;
 
-// this determines whether or not we update the offset of our split filter
-@property (nonatomic) BOOL isSwipeEnabled;
-
 // this determines whether we display video with PBJ or GPUImage
 @property (nonatomic) BOOL isFilterEnabled;
 

diff --git a/Source/PBJVision.m b/Source/PBJVision.m
@@ -225,6 +225,7 @@ @interface PBJVision () <
 @property (nonatomic, strong) GPUImageMovie *movieDataInput;
 @property (nonatomic, strong) GPUImageFilterGroup *currentFilterGroup;
 @property (nonatomic, strong) VideoFilterManager *filterManager;
+@property (nonatomic, assign) VideoFilterType currentFilterType;
 
 
 @property (nonatomic, retain) __attribute__((NSObject)) CMFormatDescriptionRef outputVideoFormatDescription;
@@ -2787,7 +2788,7 @@ - (void)_renderSampleBuffer:(CMSampleBufferRef)sampleBuffer
         if(_isFilterEnabled)
         {
             // Get filter based on scrollview offset
-            GPUImageFilterGroup *newFilterGroup = [_filterManager splitFilterGroupAtIndex:self.filterOffset airbrushFilterType:self.airbrushFilterType];
+            GPUImageFilterGroup *newFilterGroup = [_filterManager splitFilterGroupForType:self.currentFilterType airbrushFilterType:self.airbrushFilterType];
 
             // Check if the filter needs to be changed
             if (![[_movieDataInput targets] containsObject:newFilterGroup])
@@ -2812,15 +2813,6 @@ - (void)_renderSampleBuffer:(CMSampleBufferRef)sampleBuffer
                     [filter setInputRotation:rotation atIndex:0];
                 }
             }
-
-            if (_isSwipeEnabled)
-            {
-                // Tell spilt filter what percentage should be left and right filter
-                CGFloat filterPercent = ((self.filterOffset < 1) ? self.filterOffset :
-                                     self.filterOffset - (truncf(self.filterOffset)));
-                GPUImageSplitFilter *splitFilter = (GPUImageSplitFilter*)[_currentFilterGroup filterAtIndex:_currentFilterGroup.filterCount-1];
-                [splitFilter setOffset:filterPercent];
-            }
         }
         else
         {