Skip to content

Commit fabae8d

Browse files
author
chenliming
committed
update version
1 parent 12e1066 commit fabae8d

File tree

6 files changed

+80
-8
lines changed

6 files changed

+80
-8
lines changed

‎FrameWork/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.4.1</string>
18+
<string>2.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎FrameWork/LFLiveKit.xcodeproj/project.pbxproj

+65
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1F3858C76FA5230BD4B34FEF /* libPods-LFLiveKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D9E53AEC8F2938295308B625 /* libPods-LFLiveKit.a */; };
1011
84D8B4BF1D757EB800752B56 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D8B4BE1D757EB800752B56 /* VideoToolbox.framework */; };
1112
84D8B4C11D757EBE00752B56 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D8B4C01D757EBE00752B56 /* AudioToolbox.framework */; };
1213
84D8B4C31D757EC400752B56 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D8B4C21D757EC400752B56 /* AVFoundation.framework */; };
@@ -63,6 +64,7 @@
6364
/* End PBXBuildFile section */
6465

6566
/* Begin PBXFileReference section */
67+
7F7E051931BABE0B14FE6A57 /* Pods-LFLiveKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit.debug.xcconfig"; sourceTree = "<group>"; };
6668
84D8B3901D7574D600752B56 /* LFLiveKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LFLiveKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6769
84D8B4BE1D757EB800752B56 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
6870
84D8B4C01D757EBE00752B56 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -119,6 +121,8 @@
119121
84D8B5B81D768B6E00752B56 /* LFStreamSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamSocket.h; sourceTree = "<group>"; };
120122
84D8B5B91D768B6E00752B56 /* NSMutableArray+LFAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+LFAdd.h"; sourceTree = "<group>"; };
121123
84D8B5BA1D768B6E00752B56 /* NSMutableArray+LFAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+LFAdd.m"; sourceTree = "<group>"; };
124+
BF1D108D206BBD2267CDB4FB /* Pods-LFLiveKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit.release.xcconfig"; sourceTree = "<group>"; };
125+
D9E53AEC8F2938295308B625 /* libPods-LFLiveKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LFLiveKit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
122126
/* End PBXFileReference section */
123127

124128
/* Begin PBXFrameworksBuildPhase section */
@@ -131,6 +135,7 @@
131135
84D8B4C31D757EC400752B56 /* AVFoundation.framework in Frameworks */,
132136
84D8B4C11D757EBE00752B56 /* AudioToolbox.framework in Frameworks */,
133137
84D8B4BF1D757EB800752B56 /* VideoToolbox.framework in Frameworks */,
138+
1F3858C76FA5230BD4B34FEF /* libPods-LFLiveKit.a in Frameworks */,
134139
);
135140
runOnlyForDeploymentPostprocessing = 0;
136141
};
@@ -149,6 +154,8 @@
149154
84D8B4C01D757EBE00752B56 /* AudioToolbox.framework */,
150155
84D8B4BE1D757EB800752B56 /* VideoToolbox.framework */,
151156
84D8B3911D7574D600752B56 /* Products */,
157+
D77470616157694EC6FD0A0D /* Pods */,
158+
9ABACAFFC334034AA0115426 /* Frameworks */,
152159
);
153160
sourceTree = "<group>";
154161
};
@@ -272,6 +279,23 @@
272279
path = publish;
273280
sourceTree = "<group>";
274281
};
282+
9ABACAFFC334034AA0115426 /* Frameworks */ = {
283+
isa = PBXGroup;
284+
children = (
285+
D9E53AEC8F2938295308B625 /* libPods-LFLiveKit.a */,
286+
);
287+
name = Frameworks;
288+
sourceTree = "<group>";
289+
};
290+
D77470616157694EC6FD0A0D /* Pods */ = {
291+
isa = PBXGroup;
292+
children = (
293+
7F7E051931BABE0B14FE6A57 /* Pods-LFLiveKit.debug.xcconfig */,
294+
BF1D108D206BBD2267CDB4FB /* Pods-LFLiveKit.release.xcconfig */,
295+
);
296+
name = Pods;
297+
sourceTree = "<group>";
298+
};
275299
/* End PBXGroup section */
276300

277301
/* Begin PBXHeadersBuildPhase section */
@@ -315,10 +339,12 @@
315339
isa = PBXNativeTarget;
316340
buildConfigurationList = 84D8B3981D7574D600752B56 /* Build configuration list for PBXNativeTarget "LFLiveKit" */;
317341
buildPhases = (
342+
2833F857062C89FFF3975A1B /* 📦 Check Pods Manifest.lock */,
318343
84D8B38B1D7574D600752B56 /* Sources */,
319344
84D8B38C1D7574D600752B56 /* Frameworks */,
320345
84D8B38D1D7574D600752B56 /* Headers */,
321346
84D8B38E1D7574D600752B56 /* Resources */,
347+
D64BB080ABC44A32A8D6E2CF /* 📦 Copy Pods Resources */,
322348
);
323349
buildRules = (
324350
);
@@ -370,6 +396,39 @@
370396
};
371397
/* End PBXResourcesBuildPhase section */
372398

399+
/* Begin PBXShellScriptBuildPhase section */
400+
2833F857062C89FFF3975A1B /* 📦 Check Pods Manifest.lock */ = {
401+
isa = PBXShellScriptBuildPhase;
402+
buildActionMask = 2147483647;
403+
files = (
404+
);
405+
inputPaths = (
406+
);
407+
name = "📦 Check Pods Manifest.lock";
408+
outputPaths = (
409+
);
410+
runOnlyForDeploymentPostprocessing = 0;
411+
shellPath = /bin/sh;
412+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
413+
showEnvVarsInLog = 0;
414+
};
415+
D64BB080ABC44A32A8D6E2CF /* 📦 Copy Pods Resources */ = {
416+
isa = PBXShellScriptBuildPhase;
417+
buildActionMask = 2147483647;
418+
files = (
419+
);
420+
inputPaths = (
421+
);
422+
name = "📦 Copy Pods Resources";
423+
outputPaths = (
424+
);
425+
runOnlyForDeploymentPostprocessing = 0;
426+
shellPath = /bin/sh;
427+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit-resources.sh\"\n";
428+
showEnvVarsInLog = 0;
429+
};
430+
/* End PBXShellScriptBuildPhase section */
431+
373432
/* Begin PBXSourcesBuildPhase section */
374433
84D8B38B1D7574D600752B56 /* Sources */ = {
375434
isa = PBXSourcesBuildPhase;
@@ -495,15 +554,18 @@
495554
};
496555
84D8B3991D7574D600752B56 /* Debug */ = {
497556
isa = XCBuildConfiguration;
557+
baseConfigurationReference = 7F7E051931BABE0B14FE6A57 /* Pods-LFLiveKit.debug.xcconfig */;
498558
buildSettings = {
499559
DEFINES_MODULE = YES;
500560
DYLIB_COMPATIBILITY_VERSION = 1;
501561
DYLIB_CURRENT_VERSION = 1;
502562
DYLIB_INSTALL_NAME_BASE = "@rpath";
563+
HEADER_SEARCH_PATHS = "$(inherited)";
503564
INFOPLIST_FILE = Info.plist;
504565
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
505566
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
506567
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
568+
LIBRARY_SEARCH_PATHS = "$(inherited)";
507569
MACH_O_TYPE = staticlib;
508570
OTHER_LDFLAGS = "";
509571
PRODUCT_BUNDLE_IDENTIFIER = com.youku.LFLiveKit;
@@ -514,15 +576,18 @@
514576
};
515577
84D8B39A1D7574D600752B56 /* Release */ = {
516578
isa = XCBuildConfiguration;
579+
baseConfigurationReference = BF1D108D206BBD2267CDB4FB /* Pods-LFLiveKit.release.xcconfig */;
517580
buildSettings = {
518581
DEFINES_MODULE = YES;
519582
DYLIB_COMPATIBILITY_VERSION = 1;
520583
DYLIB_CURRENT_VERSION = 1;
521584
DYLIB_INSTALL_NAME_BASE = "@rpath";
585+
HEADER_SEARCH_PATHS = "$(inherited)";
522586
INFOPLIST_FILE = Info.plist;
523587
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
524588
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
525589
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
590+
LIBRARY_SEARCH_PATHS = "$(inherited)";
526591
MACH_O_TYPE = staticlib;
527592
OTHER_LDFLAGS = "";
528593
PRODUCT_BUNDLE_IDENTIFIER = com.youku.LFLiveKit;

‎FrameWork/Podfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://github.com/CocoaPods/Specs.git'
2+
platform :ios,'7.0'
3+
4+
target “LFLiveKit” do
5+
pod 'pili-librtmp', '~> 1.0.3.1'
6+
pod 'LMGPUImage'
7+
end

‎LFLiveKit.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Pod::Spec.new do |s|
33

44
s.name = "LFLiveKit"
5-
s.version = "2.4.1"
5+
s.version = "2.4"
66
s.summary = "LaiFeng ios Live. LFLiveKit."
77
s.homepage = "https://github.com/chenliming777"
88
s.license = { :type => "MIT", :file => "LICENSE" }
@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
1717
s.libraries = "c++", "z"
1818

1919
s.requires_arc = true
20-
s.dependency 'GPUImage'
20+
s.dependency 'LMGPUImage'
2121
s.dependency 'pili-librtmp', '1.0.3.1'
2222
end

‎LFLiveKit/capture/LFVideoCapture.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@ - (void)processVideo:(GPUImageOutput *)output {
271271
__weak typeof(self) _self = self;
272272
@autoreleasepool {
273273
GPUImageFramebuffer *imageFramebuffer = output.framebufferForOutput;
274-
//CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
275-
//if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
276-
//[_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
277-
//}
274+
CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
275+
if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
276+
[_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
277+
}
278278
}
279279
}
280280

‎LFLiveKit/publish/LFStreamRtmpSocket.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define SAVC(x) static const AVal av_ ## x = AVC(#x)
2929

3030
static const AVal av_setDataFrame = AVC("@setDataFrame");
31-
static const AVal av_SDKVersion = AVC("LFLiveKit 1.8.0");
31+
static const AVal av_SDKVersion = AVC("LFLiveKit 2.4.0");
3232
SAVC(onMetaData);
3333
SAVC(duration);
3434
SAVC(width);

0 commit comments

Comments
 (0)