Skip to content

Commit

Permalink
Merge pull request #109 from Kivenhaoyu/2.3.5_dev
Browse files Browse the repository at this point in the history
v2.3.5_release
  • Loading branch information
Kivenhaoyu committed Feb 18, 2020
2 parents 821b252 + 3cf420e commit ae051c5
Show file tree
Hide file tree
Showing 22 changed files with 884 additions and 747 deletions.
13 changes: 13 additions & 0 deletions APIDiffs/api-diffs-2.3.5.md
@@ -0,0 +1,13 @@
# PLMediaStreamingKit 2.3.4 to 2.3.5 API Differences

## General Headers

```
PLMediaStreamingSession.h
```
- *Added* `- (CVPixelBufferRef __nonnull)mediaStreamingSession:(PLMediaStreamingSession *__nonnull)session cameraSourceDidGetPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer timingInfo:(CMSampleTimingInfo)timingInfo;`

- *Deprecated* `- (CVPixelBufferRef)mediaStreamingSession:(PLMediaStreamingSession *)session cameraSourceDidGetPixelBuffer:(CVPixelBufferRef)pixelBuffer;`

- *Added* ` - (void)pushSEIMessage:(nonnull NSString *)message repeat:(NSInteger)repeatNum;`

2 changes: 1 addition & 1 deletion Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj
Expand Up @@ -136,7 +136,7 @@
B6FC33AA1D93C398004EEE29 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; };
B6FC33B21D93C470004EEE29 /* PLAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAppDelegate.h; sourceTree = "<group>"; };
B6FC33B31D93C470004EEE29 /* PLAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAppDelegate.m; sourceTree = "<group>"; };
B6FC33B51D93C603004EEE29 /* PLMediaStreamingKit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PLMediaStreamingKit.podspec; path = ../PLMediaStreamingKit.podspec; sourceTree = "<group>"; };
B6FC33B51D93C603004EEE29 /* PLMediaStreamingKit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PLMediaStreamingKit.podspec; path = ../PLMediaStreamingKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
B6FC33BD1D93C970004EEE29 /* PLAlertSpinner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAlertSpinner.h; sourceTree = "<group>"; };
B6FC33BE1D93C970004EEE29 /* PLAlertSpinner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAlertSpinner.m; sourceTree = "<group>"; };
B6FC33BF1D93C970004EEE29 /* PLAttributeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAttributeModel.h; sourceTree = "<group>"; };
Expand Down
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
10 changes: 5 additions & 5 deletions Example/Podfile.lock
Expand Up @@ -18,9 +18,9 @@ PODS:
- Fabric (~> 1.10.1)
- Fabric (1.10.1)
- Masonry (1.1.0)
- PLMediaStreamingKit (2.3.4):
- PLMediaStreamingKit/iphoneos (= 2.3.4)
- PLMediaStreamingKit/iphoneos (2.3.4)
- PLMediaStreamingKit (2.3.5):
- PLMediaStreamingKit/iphoneos (= 2.3.5)
- PLMediaStreamingKit/iphoneos (2.3.5)
- WeiboSDK (3.1.3)

DEPENDENCIES:
Expand Down Expand Up @@ -48,9 +48,9 @@ SPEC CHECKSUMS:
Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0
Fabric: f6f21452846788bb44595d73e9909d79d328e617
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
PLMediaStreamingKit: 48a16270731a0a3fec8712c7dffe1e5701e6bcec
PLMediaStreamingKit: f457a9a15bf1c31eccb894f0fe7e18fd301b055e
WeiboSDK: acb067053668102cf07d01aa7604350162c2e466

PODFILE CHECKSUM: 6f679f7dc7004741cffdbbe7fd79b0f13ed22c4a

COCOAPODS: 1.6.1
COCOAPODS: 1.7.5
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ae051c5

Please sign in to comment.