Merge remote-tracking branch 'origin/2.1'

zakk4223 · Dec 25, 2017 · d7d9358 · d7d9358
2 parents f3f7f2a + c5c2dd9
commit d7d9358
Show file tree

Hide file tree

Showing 410 changed files with 28,379 additions and 10,416 deletions.
diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin.xcodeproj/project.pbxproj b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin.xcodeproj/project.pbxproj
@@ -136,7 +136,7 @@
 		343C79B21D0C763A00B36EEC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Zakk;
 				TargetAttributes = {
 					343C79B91D0C763A00B36EEC = {
@@ -197,13 +197,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -241,13 +249,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";

diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.h b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.h
@@ -27,6 +27,10 @@
 #import "libavutil/pixdesc.h"
 
 
+#define FILE_UTI_TYPES @[@"com.apple.quicktime-movie", @"public.mpeg-4"]
+
+
+
 @interface CSFFMpegCapture : CSCaptureBase <CSCaptureSourceProtocol>
 {
     AVFormatContext *_avFmtCtx;
@@ -41,9 +45,7 @@
     CFTimeInterval _lastTimeUpdate;
     double _savedTime;
     NSSize _lastSize;
-
-
-
+    bool _firstFrame;
 
 }
 
@@ -57,6 +59,9 @@
 @property (assign) double currentMovieDuration;
 @property (assign) bool playWhenLive;
 @property (assign) bool useCurrentPosition;
+@property (assign) bool updateMovieTime;
+@property (assign) ff_movie_repeat repeat;
+@property (strong) NSString *uuid;