remove pili_rtmp

This reverts commit cf56d72598.

LFLiveKit.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "2.2.2"
+  s.version      = "2.2.4"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -18,9 +18,6 @@ Pod::Spec.new do |s|
   s.libraries = "c++", "z"
 
   s.requires_arc = true
-#s.ios.vendored_frameworks = 'Vendor/GPUImage.framework','Vendor/pili_rtmp.framework'
-
-s.dependency 'GPUImage'
-s.dependency 'pili-librtmp', '1.0.3.1'
+  s.ios.vendored_frameworks = 'Vendor/GPUImage.framework','Vendor/pili-librtmp.framework'
 
 end

LFLiveKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.2</string>
+	<string>2.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

LFLiveKit/LFLiveKit.xcodeproj/project.pbxproj

@@ -501,7 +501,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Vendor/GPUImage.framework/Headers\"",
-					"\"$(SRCROOT)/../Vendor/pili_rtmp.framework/Headers\"",
+					"\"$(SRCROOT)/../Vendor/pili-librtmp.framework/Headers\"",
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -524,7 +524,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Vendor/GPUImage.framework/Headers\"",
-					"\"$(SRCROOT)/../Vendor/pili_rtmp.framework/Headers\"",
+					"\"$(SRCROOT)/../Vendor/pili-librtmp.framework/Headers\"",
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

LFLiveKit/LFLiveKit/capture/LFVideoCapture.m

@@ -7,10 +7,17 @@
 //
 
 #import "LFVideoCapture.h"
-#import "GPUImage.h"
 #import "LFGPUImageBeautyFilter.h"
 #import "LFGPUImageEmptyFilter.h"
 
+#if __has_include(<GPUImage/GPUImage.h>)
+#import <GPUImage/GPUImage.h>
+#elif __has_include("GPUImage/GPUImage.h")
+#import "GPUImage/GPUImage.h"
+#else
+#import "GPUImage.h"
+#endif
+
 @interface LFVideoCapture ()
 
 @property (nonatomic, strong) GPUImageVideoCamera *videoCamera;
@@ -263,10 +270,10 @@
     __weak typeof(self) _self = self;
     @autoreleasepool {
         GPUImageFramebuffer *imageFramebuffer = output.framebufferForOutput;
-//        CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
-//        if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
-//            [_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
-//        }
+        CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
+        if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
+            [_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
+        }
     }
 }
 

LFLiveKit/LFLiveKit/filter/LFGPUImageBeautyFilter.h

@@ -1,5 +1,10 @@
-#import "GPUImageFilter.h"
-
+#if __has_include(<GPUImage/GPUImage.h>)
+#import <GPUImage/GPUImage.h>
+#elif __has_include("GPUImage/GPUImage.h")
+#import "GPUImage/GPUImage.h"
+#else
+#import "GPUImage.h"
+#endif
 @interface LFGPUImageBeautyFilter : GPUImageFilter {
 }
 

LFLiveKit/LFLiveKit/filter/LFGPUImageEmptyFilter.h

@@ -1,4 +1,10 @@
-#import "GPUImageFilter.h"
+#if __has_include(<GPUImage/GPUImage.h>)
+#import <GPUImage/GPUImage.h>
+#elif __has_include("GPUImage/GPUImage.h")
+#import "GPUImage/GPUImage.h"
+#else
+#import "GPUImage.h"
+#endif
 
 @interface LFGPUImageEmptyFilter : GPUImageFilter
 {

LFLiveKit/LFLiveKit/publish/LFStreamRtmpSocket.m

@@ -7,7 +7,14 @@
 //
 
 #import "LFStreamRTMPSocket.h"
+
+#if __has_include(<pili-librtmp/rtmp.h>)
+#import <pili-librtmp/rtmp.h>
+#elif __has_include("pili-librtmp/rtmp.h")
+#import "pili-librtmp/rtmp.h"
+#else
 #import "rtmp.h"
+#endif
 
 static const NSInteger RetryTimesBreaken = 20;  ///<  重连1分钟  3秒一次 一共20次
 static const NSInteger RetryTimesMargin = 3;

Vendor/pili-librtmp.framework/_CodeSignature/CodeResources

@@ -46,7 +46,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		IXtWyFBgIb9xtuVHWWG7iOCpFVg=
+		jBTUuQpeANWyu36KXLiUdaEFXR8=
 		</data>
 	</dict>
 	<key>files2</key>