Kubrick improve performance

GPUImage2.podspec

@@ -0,0 +1,20 @@
+Pod::Spec.new do |s|
+  s.name     = 'GPUImage2'
+  s.version  = '0.1.0'
+  s.license  = 'BSD'
+  s.summary  = 'An open source iOS framework for GPU-based image and video processing.'
+  s.homepage = 'https://github.com/BradLarson/GPUImage2'
+  s.author   = { 'Brad Larson' => 'contact@sunsetlakesoftware.com' }
+
+  s.source   = { :git => 'https://github.com/RoCry/GPUImage2' }
+
+  s.source_files = 'framework/Source/**/*.{h,m,swift}'
+  s.resources = 'framework/Source/Operations/Shaders/*.{fsh}'
+  s.requires_arc = true
+  s.xcconfig = { 'CLANG_MODULES_AUTOLINK' => 'YES', 'OTHER_SWIFT_FLAGS' => "$(inherited) -DGLES"}
+
+  s.ios.deployment_target = '10.0'
+  s.ios.exclude_files = 'framework/Source/Mac', 'framework/Source/Linux', 'framework/Source/Operations/Shaders/ConvertedShaders_GL.swift'
+  s.frameworks   = ['OpenGLES', 'CoreMedia', 'QuartzCore', 'AVFoundation']
+
+end

README.md

@@ -152,7 +152,7 @@ There are a few different ways to approach filtering an image. The easiest are t
 ```swift
 let testImage = UIImage(named:"WID-small.jpg")!
 let toonFilter = SmoothToonFilter()
-let filteredImage = testImage.filterWithOperation(toonFilter)
+let filteredImage = try! testImage.filterWithOperation(toonFilter)
 ```
 
 for a more complex pipeline:
@@ -161,7 +161,7 @@ for a more complex pipeline:
 let testImage = UIImage(named:"WID-small.jpg")!
 let toonFilter = SmoothToonFilter()
 let luminanceFilter = Luminance()
-let filteredImage = testImage.filterWithPipeline{input, output in
+let filteredImage = try! testImage.filterWithPipeline{input, output in
     input --> toonFilter --> luminanceFilter --> output
 }
 ```
@@ -173,7 +173,7 @@ Both of these convenience methods wrap several operations. To feed a picture int
 ```swift
 let toonFilter = SmoothToonFilter()
 let testImage = UIImage(named:"WID-small.jpg")!
-let pictureInput = PictureInput(image:testImage)
+let pictureInput = try! PictureInput(image:testImage)
 let pictureOutput = PictureOutput()
 pictureOutput.imageAvailableCallback = {image in
     // Do something with image
@@ -186,24 +186,116 @@ In the above, the imageAvailableCallback will be triggered right at the processI
 
 ### Filtering and re-encoding a movie ###
 
-To filter an existing movie file, you can write code like the following:
+To filter and playback an existing movie file, you can write code like the following:
 
 ```swift
 
 do {
-	let bundleURL = Bundle.main.resourceURL!
-	let movieURL = URL(string:"sample_iPod.m4v", relativeTo:bundleURL)!
-	movie = try MovieInput(url:movieURL, playAtActualSpeed:true)
+    let bundleURL = Bundle.main.resourceURL!
+    let movieURL = URL(string:"sample_iPod.m4v", relativeTo:bundleURL)!
+
+    let audioDecodeSettings = [AVFormatIDKey:kAudioFormatLinearPCM]
+
+    movie = try MovieInput(url:movieURL, playAtActualSpeed:true, loop:true, audioSettings:audioDecodeSettings)
+    speaker = SpeakerOutput()
+    movie.audioEncodingTarget = speaker
+
     filter = SaturationAdjustment()
     movie --> filter --> renderView
+
     movie.start()
+    speaker.start()
 } catch {
-    fatalError("Could not initialize rendering pipeline: \(error)")
+    print("Couldn't process movie with error: \(error)")
 }
 ```
 
 where renderView is an instance of RenderView that you've placed somewhere in your view hierarchy. The above loads a movie named "sample_iPod.m4v" from the application's bundle, creates a saturation filter, and directs movie frames to be processed through the saturation filter on their way to the screen. start() initiates the movie playback.
 
+To filter an existing movie file and save the result to a new movie file you can write code like the following:
+
+
+```swift
+let bundleURL = Bundle.main.resourceURL!
+// The movie you want to reencode
+let movieURL = URL(string:"sample_iPod.m4v", relativeTo:bundleURL)!
+
+let documentsDir = FileManager().urls(for:.documentDirectory, in:.userDomainMask).first!
+// The location you want to save the new video
+let exportedURL = URL(string:"test.mp4", relativeTo:documentsDir)!
+
+let asset = AVURLAsset(url:movieURL, options:[AVURLAssetPreferPreciseDurationAndTimingKey:NSNumber(value:true)])
+
+guard let videoTrack = asset.tracks(withMediaType:.video).first else { return }
+let audioTrack = asset.tracks(withMediaType:.audio).first
+
+// If you would like passthrough audio instead, set both audioDecodingSettings and audioEncodingSettings to nil
+let audioDecodingSettings:[String:Any] = [AVFormatIDKey:kAudioFormatLinearPCM] // Noncompressed audio samples
+
+do {
+    movieInput = try MovieInput(asset:asset, videoComposition:nil, playAtActualSpeed:false, loop:false, audioSettings:audioDecodingSettings)
+}
+catch {
+    print("ERROR: Unable to setup MovieInput with error: \(error)")
+    return
+}
+
+try? FileManager().removeItem(at: exportedURL)
+
+let videoEncodingSettings:[String:Any] = [
+    AVVideoCompressionPropertiesKey: [
+        AVVideoExpectedSourceFrameRateKey:videoTrack.nominalFrameRate,
+        AVVideoAverageBitRateKey:videoTrack.estimatedDataRate,
+        AVVideoProfileLevelKey:AVVideoProfileLevelH264HighAutoLevel,
+        AVVideoH264EntropyModeKey:AVVideoH264EntropyModeCABAC,
+        AVVideoAllowFrameReorderingKey:videoTrack.requiresFrameReordering],
+    AVVideoCodecKey:AVVideoCodecH264]
+
+var acl = AudioChannelLayout()
+memset(&acl, 0, MemoryLayout<AudioChannelLayout>.size)
+acl.mChannelLayoutTag = kAudioChannelLayoutTag_Stereo
+let audioEncodingSettings:[String:Any] = [
+    AVFormatIDKey:kAudioFormatMPEG4AAC,
+    AVNumberOfChannelsKey:2,
+    AVSampleRateKey:AVAudioSession.sharedInstance().sampleRate,
+    AVChannelLayoutKey:NSData(bytes:&acl, length:MemoryLayout<AudioChannelLayout>.size),
+    AVEncoderBitRateKey:96000
+]
+
+do {
+    movieOutput = try MovieOutput(URL:exportedURL, size:Size(width:Float(videoTrack.naturalSize.width), height:Float(videoTrack.naturalSize.height)), fileType:AVFileType.mp4.rawValue, liveVideo:false, videoSettings:videoEncodingSettings, videoNaturalTimeScale:videoTrack.naturalTimeScale, audioSettings:audioEncodingSettings)
+}
+catch {
+    print("ERROR: Unable to setup MovieOutput with error: \(error)")
+    return
+}
+
+filter = SaturationAdjustment()
+
+if(audioTrack != nil) { movieInput.audioEncodingTarget = movieOutput }
+movieInput.synchronizedMovieOutput = movieOutput
+movieInput --> filter --> movieOutput
+
+movieInput.completion = {
+    self.movieOutput.finishRecording {
+        self.movieInput.audioEncodingTarget = nil
+        self.movieInput.synchronizedMovieOutput = nil
+        print("Encoding finished")
+    }
+}
+
+movieOutput.startRecording() { started, error in
+    if(!started) {
+        print("ERROR: MovieOutput unable to start writing with error: \(String(describing: error))")
+        return
+    }
+    self.movieInput.start()
+    print("Encoding started")
+}
+```
+
+ The above loads a movie named "sample_iPod.m4v" from the application's bundle, creates a saturation filter, and directs movie frames to be processed through the saturation filter on their way to the new file. In addition it writes the audio in AAC format to the new file.
+
 ### Writing a custom image processing operation ###
 
 The framework uses a series of protocols to define types that can output images to be processed, take in an image for processing, or do both. These are the ImageSource, ImageConsumer, and ImageProcessingOperation protocols, respectively. Any type can comply to these, but typically classes are used.

examples/Linux-OpenGL/SimpleVideoFilter/Source/main.swift

@@ -1,11 +1,11 @@
 import GPUImage
 
 // For now, GLUT initialization is done in the render window, so that must come first in sequence
-let renderWindow = GLUTRenderWindow(width:1280, height:720, title:"Simple Video Filter")
-let camera = V4LCamera(size:Size(width:1280.0, height:720.0))
+let renderWindow = GLUTRenderWindow(width: 1280, height: 720, title: "Simple Video Filter")
+let camera = V4LCamera(size: Size(width: 1280.0, height: 720.0))
 let edgeDetection = SobelEdgeDetection()
 
 camera --> edgeDetection --> renderWindow
 
 camera.startCapture()
-renderWindow.loopWithFunction(camera.grabFrame)
+renderWindow.loopWithFunction(camera.grabFrame)

examples/Linux-RPi/SimpleVideoFilter/Source/main.swift

@@ -1,15 +1,15 @@
 import GPUImage
 
 // For now, rendering requires the window to be created first
-let renderWindow = RPiRenderWindow(width:1280, height:720)
-let camera = V4LCamera(size:Size(width:1280.0, height:720.0))
+let renderWindow = RPiRenderWindow(width: 1280, height: 720)
+let camera = V4LCamera(size: Size(width: 1280.0, height: 720.0))
 let edgeDetection = SobelEdgeDetection()
 
 camera --> edgeDetection --> renderWindow
 
-var terminate:Int = 0
+var terminate: Int = 0
 
 camera.startCapture()
-while (terminate == 0) {
+while terminate == 0 {
 	camera.grabFrame()
-}
+}

examples/Mac/FilterShowcase/FilterShowcase/AppDelegate.swift

@@ -2,14 +2,12 @@ import Cocoa
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
-
     @IBOutlet weak var window: NSWindow!
 
-    var windowController:FilterShowcaseWindowController?
+    var windowController: FilterShowcaseWindowController?
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        self.windowController = FilterShowcaseWindowController(windowNibName:"FilterShowcaseWindowController")
+        self.windowController = FilterShowcaseWindowController(windowNibName: "FilterShowcaseWindowController")
         self.windowController?.showWindow(self)
     }
 }
-

examples/Mac/FilterShowcase/FilterShowcase/FilterOperationTypes.swift

@@ -3,41 +3,41 @@ import GPUImage
 
 enum FilterSliderSetting {
     case disabled
-    case enabled(minimumValue:Float, maximumValue:Float, initialValue:Float)
+    case enabled(minimumValue: Float, maximumValue: Float, initialValue: Float)
 }
 
 typealias FilterSetupFunction = (Camera, ImageProcessingOperation, RenderView) -> ImageSource?
 
 enum FilterOperationType {
     case singleInput
     case blend
-    case custom(filterSetupFunction:FilterSetupFunction)
+    case custom(filterSetupFunction: FilterSetupFunction)
 }
 
 protocol FilterOperationInterface {
     var filter: ImageProcessingOperation { get }
-    var secondInput:ImageSource? { get }
+    var secondInput: ImageSource? { get }
     var listName: String { get }
     var titleName: String { get }
-    var sliderConfiguration: FilterSliderSetting  { get }
-    var filterOperationType: FilterOperationType  { get }
+    var sliderConfiguration: FilterSliderSetting { get }
+    var filterOperationType: FilterOperationType { get }
 
-    func configureCustomFilter(_ secondInput:ImageSource?)
-    func updateBasedOnSliderValue(_ sliderValue:Float)
+    func configureCustomFilter(_ secondInput: ImageSource?)
+    func updateBasedOnSliderValue(_ sliderValue: Float)
 }
 
 class FilterOperation<FilterClass: ImageProcessingOperation>: FilterOperationInterface {
-    lazy var internalFilter:FilterClass = {
+    lazy var internalFilter: FilterClass = {
         return self.filterCreationFunction()
     }()
     let filterCreationFunction:() -> FilterClass
-    var secondInput:ImageSource?
-    let listName:String
-    let titleName:String
-    let sliderConfiguration:FilterSliderSetting
-    let filterOperationType:FilterOperationType
-    let sliderUpdateCallback: ((FilterClass, Float) -> ())?
-    init(filter:@escaping () -> FilterClass, listName: String, titleName: String, sliderConfiguration: FilterSliderSetting, sliderUpdateCallback:((FilterClass, Float) -> ())?, filterOperationType: FilterOperationType) {
+    var secondInput: ImageSource?
+    let listName: String
+    let titleName: String
+    let sliderConfiguration: FilterSliderSetting
+    let filterOperationType: FilterOperationType
+    let sliderUpdateCallback: ((FilterClass, Float) -> Void)?
+    init(filter:@escaping () -> FilterClass, listName: String, titleName: String, sliderConfiguration: FilterSliderSetting, sliderUpdateCallback: ((FilterClass, Float) -> Void)?, filterOperationType: FilterOperationType) {
         self.listName = listName
         self.titleName = titleName
         self.sliderConfiguration = sliderConfiguration
@@ -50,12 +50,11 @@ class FilterOperation<FilterClass: ImageProcessingOperation>: FilterOperationInt
         return internalFilter
     }
 
-    func configureCustomFilter(_ secondInput:ImageSource?) {
+    func configureCustomFilter(_ secondInput: ImageSource?) {
         self.secondInput = secondInput
     }
 
-    func updateBasedOnSliderValue(_ sliderValue:Float) {
+    func updateBasedOnSliderValue(_ sliderValue: Float) {
         sliderUpdateCallback?(internalFilter, sliderValue)
     }
 }
-