Merge pull request #84 from zakk4223/2.1

2.1.1. pull
zakk4223 · Dec 27, 2017 · aa32d0c · aa32d0c
2 parents d7d9358 + f6df032
commit aa32d0c
Show file tree

Hide file tree

Showing 14 changed files with 650 additions and 577 deletions.
diff --git a/CocoaSplit.xcodeproj/project.pbxproj b/CocoaSplit.xcodeproj/project.pbxproj
@@ -155,6 +155,8 @@
 		347B7FC616907A1700B5F4B3 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 347B7FC516907A1700B5F4B3 /* libbz2.dylib */; };
 		347B7FC816907AE700B5F4B3 /* VideoDecodeAcceleration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347B7FC716907AE700B5F4B3 /* VideoDecodeAcceleration.framework */; };
 		347BEAAB1E5BCBAF0026A094 /* CSOpenGLLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347BEAAA1E5BCBAF0026A094 /* CSOpenGLLayer.m */; };
+		347DBC831FF1EA1700B98D5E /* AppleVTCompressorBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 347DBC821FF1EA1700B98D5E /* AppleVTCompressorBase.m */; };
+		347DBC9D1FF22C0100B98D5E /* CSAppleHEVCCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 347DBC9C1FF22C0100B98D5E /* CSAppleHEVCCompressor.m */; };
 		3481F30619B48C7C00CC76D8 /* SourceLayout+ScriptingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3481F30519B48C7C00CC76D8 /* SourceLayout+ScriptingAdditions.m */; };
 		348AC06B19B406910064F02D /* SourceLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 348AC06A19B406910064F02D /* SourceLayout.m */; };
 		34938EE81AE4A7E500F3B1CF /* CSCIFilterConfigProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 34938EE71AE4A7E500F3B1CF /* CSCIFilterConfigProxy.m */; };
@@ -814,6 +816,10 @@
 		347B7FC916907AFA00B5F4B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		347BEAA91E5BCBAF0026A094 /* CSOpenGLLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSOpenGLLayer.h; path = PluginHeaders/CSOpenGLLayer.h; sourceTree = "<group>"; };
 		347BEAAA1E5BCBAF0026A094 /* CSOpenGLLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSOpenGLLayer.m; sourceTree = "<group>"; };
+		347DBC811FF1EA1700B98D5E /* AppleVTCompressorBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppleVTCompressorBase.h; path = Compressor/AppleVTCompressorBase.h; sourceTree = "<group>"; };
+		347DBC821FF1EA1700B98D5E /* AppleVTCompressorBase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppleVTCompressorBase.m; path = Compressor/AppleVTCompressorBase.m; sourceTree = "<group>"; };
+		347DBC9B1FF22C0100B98D5E /* CSAppleHEVCCompressor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CSAppleHEVCCompressor.h; path = Compressor/CSAppleHEVCCompressor.h; sourceTree = "<group>"; };
+		347DBC9C1FF22C0100B98D5E /* CSAppleHEVCCompressor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CSAppleHEVCCompressor.m; path = Compressor/CSAppleHEVCCompressor.m; sourceTree = "<group>"; };
 		3481F30419B48C7C00CC76D8 /* SourceLayout+ScriptingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SourceLayout+ScriptingAdditions.h"; path = "ScriptingAddditions/SourceLayout+ScriptingAdditions.h"; sourceTree = "<group>"; };
 		3481F30519B48C7C00CC76D8 /* SourceLayout+ScriptingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SourceLayout+ScriptingAdditions.m"; path = "ScriptingAddditions/SourceLayout+ScriptingAdditions.m"; sourceTree = "<group>"; };
 		348AC06919B406910064F02D /* SourceLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceLayout.h; sourceTree = "<group>"; };
@@ -1484,6 +1490,10 @@
 				3434CB271CA8615A001B3DF9 /* AppleProResCompressor.m */,
 				3414C6AC1CBB9EBF00107C69 /* CSIRCompressor.h */,
 				3414C6AD1CBB9EBF00107C69 /* CSIRCompressor.m */,
+				347DBC811FF1EA1700B98D5E /* AppleVTCompressorBase.h */,
+				347DBC821FF1EA1700B98D5E /* AppleVTCompressorBase.m */,
+				347DBC9B1FF22C0100B98D5E /* CSAppleHEVCCompressor.h */,
+				347DBC9C1FF22C0100B98D5E /* CSAppleHEVCCompressor.m */,
 			);
 			name = Compressor;
 			sourceTree = "<group>";
@@ -2662,6 +2672,7 @@
 				34788DDB1EF5996000C3C9C5 /* CATransaction+JSExtensions.m in Sources */,
 				34ED8C6F1B07371C002C0674 /* MIKMIDIMappingGenerator.m in Sources */,
 				342346CF15F9F07E00C8C77E /* CSAbstractCaptureDevice.m in Sources */,
+				347DBC831FF1EA1700B98D5E /* AppleVTCompressorBase.m in Sources */,
 				34938EE81AE4A7E500F3B1CF /* CSCIFilterConfigProxy.m in Sources */,
 				34210B3E1606001200362FC8 /* OutputDestination.m in Sources */,
 				34ED8C9B1B07371C002C0674 /* MIKMIDIPrivateUtilities.m in Sources */,
@@ -2701,6 +2712,7 @@
 				34F80D6D1EDBC8C800D890D3 /* OutputDestination+ScriptingAdditions.m in Sources */,
 				3494DF381CCD2DB000E921BF /* TPCircularBuffer.c in Sources */,
 				349461681ABC57C100F28883 /* CSAnimationItem.m in Sources */,
+				347DBC9D1FF22C0100B98D5E /* CSAppleHEVCCompressor.m in Sources */,
 				345BED051F45A36000B46F29 /* CSSubLayoutTransitionViewController.m in Sources */,
 				34ED8C971B07371C002C0674 /* MIKMIDIPlayer.m in Sources */,
 				34ED8C591B07371C002C0674 /* MIKMIDIDevice.m in Sources */,

diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m
@@ -40,6 +40,7 @@
 #import "CSLayoutLayoutTransitionViewController.h"
 #import "CSScriptInputSource.h"
 #import "CSJSAnimationDelegate.h"
+#import "CSAppleHEVCCompressor.h"
 
 
 @implementation CaptureController
@@ -1715,7 +1716,7 @@ -(NSString *) restoreFilePath
         [fileManager createDirectoryAtPath:saveFolder withIntermediateDirectories:NO attributes:nil error:nil];
     }
 
-    NSString *saveFile = [saveFolder stringByAppendingPathComponent:@"CocoaSplit-2.1.settings"];
+    NSString *saveFile = [saveFolder stringByAppendingPathComponent:@"CocoaSplit-2-1.settings"];
 
     if ([fileManager fileExistsAtPath:saveFile])
     {
@@ -1903,6 +1904,20 @@ -(void) migrateDefaultCompressor:(NSMutableDictionary *)saveRoot
 
 
 
+
+    if (!self.compressors[@"AppleHEVC"])
+    {
+        CSAppleHEVCCompressor *newCompressor = [[CSAppleHEVCCompressor alloc] init];
+        newCompressor.name = @"AppleHEVC".mutableCopy;
+        newCompressor.average_bitrate = 1000;
+        newCompressor.max_bitrate = 1000;
+        newCompressor.keyframe_interval = 2;
+        self.compressors[@"AppleHEVC"] = newCompressor;
+        [[NSNotificationCenter defaultCenter] postNotificationName:CSNotificationCompressorAdded object:newCompressor];
+
+    }
+
+
     if (!self.compressors[@"x264"])
     {
         x264Compressor *newCompressor;
@@ -2187,8 +2202,6 @@ -(void) loadSettings
     [self migrateDefaultCompressor:saveRoot];
     [self buildExtrasMenu];
 
-    BOOL stagingHidden = [[saveRoot valueForKeyPath:@"stagingHidden"] boolValue];
-
 
     if ([saveRoot objectForKey:@"stagingHidden"])
     {

diff --git a/CocoaSplit/CocoaSplit-Info.plist b/CocoaSplit/CocoaSplit-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.1.0</string>
+	<string>2.1.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CocoaSplit/Compressor/AppleProResCompressor.h b/CocoaSplit/Compressor/AppleProResCompressor.h
@@ -8,16 +8,14 @@
 
 #import <Foundation/Foundation.h>
 #import "CaptureController.h"
-#import "CompressorBase.h"
+#import "AppleVTCompressorBase.h"
 
 #import <VideoToolbox/VideoToolbox.h>
 #import <VideoToolbox/VTVideoEncoderList.h>
 
-@interface AppleProResCompressor : CompressorBase <VideoCompressor, NSCoding>
+@interface AppleProResCompressor : AppleVTCompressorBase <VideoCompressor, NSCoding>
 {
-
-    VTCompressionSessionRef _compression_session;
-    VTPixelTransferSessionRef _vtpt_ref;
+
 
 }
 
@@ -27,6 +25,5 @@
 @property (strong) NSNumber *proResType;
 
 
--(bool)compressFrame:(CapturedFrameData *)frameData;
 
 @end