Skip to content

Commit

Permalink
Update to v1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
0dayZh committed Dec 17, 2015
1 parent bf0f658 commit e5edc91
Show file tree
Hide file tree
Showing 148 changed files with 5,477 additions and 1,014 deletions.
9 changes: 9 additions & 0 deletions APIDiffs/api-diffs-1.5.0.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# PLCameraStreamingKit 1.4.16 to 1.5.0 API Differences

## General Headers

- *Removed* `PLAudioStreamingSession.h`

```PLCameraStreamingKit.h```

- *Modified* `PLCameraStreamingSession`
6 changes: 0 additions & 6 deletions Example/PLCameraStreamingKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
762780721AF24D8D00DDFAFD /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 762780711AF24D8D00DDFAFD /* Reachability.m */; };
769750EF1A6331080079423B /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 769750EC1A6329DC0079423B /* VideoToolbox.framework */; };
E942D0081BB94957006DEDCA /* PLAudioStreamingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E942D0071BB94957006DEDCA /* PLAudioStreamingViewController.m */; };
E942D00A1BB94BCC006DEDCA /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E942D0091BB94BCC006DEDCA /* Launch Screen.storyboard */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -73,8 +72,6 @@
D0F068B3401C09FA4EA68D8E /* libPods-PLCameraStreamingKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PLCameraStreamingKit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
DD456E148A624B6E6ECC62AB /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = "<group>"; };
E51D5EAEC12F200B391FBA24 /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
E942D0061BB94957006DEDCA /* PLAudioStreamingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAudioStreamingViewController.h; sourceTree = "<group>"; };
E942D0071BB94957006DEDCA /* PLAudioStreamingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAudioStreamingViewController.m; sourceTree = "<group>"; };
E942D0091BB94BCC006DEDCA /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -161,8 +158,6 @@
E942D0091BB94BCC006DEDCA /* Launch Screen.storyboard */,
6003F5A5195388D20070C39A /* PLCameraStreamingViewController.h */,
6003F5A6195388D20070C39A /* PLCameraStreamingViewController.m */,
E942D0061BB94957006DEDCA /* PLAudioStreamingViewController.h */,
E942D0071BB94957006DEDCA /* PLAudioStreamingViewController.m */,
762780701AF24D8D00DDFAFD /* Reachability.h */,
762780711AF24D8D00DDFAFD /* Reachability.m */,
6003F5A8195388D20070C39A /* Images.xcassets */,
Expand Down Expand Up @@ -419,7 +414,6 @@
files = (
6003F59E195388D20070C39A /* PLAppDelegate.m in Sources */,
6003F5A7195388D20070C39A /* PLCameraStreamingViewController.m in Sources */,
E942D0081BB94957006DEDCA /* PLAudioStreamingViewController.m in Sources */,
762780721AF24D8D00DDFAFD /* Reachability.m in Sources */,
6003F59A195388D20070C39A /* main.m in Sources */,
);
Expand Down
75 changes: 2 additions & 73 deletions Example/PLCameraStreamingKit/Base.lproj/Main_iPhone.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0aL-3q-s7A">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0aL-3q-s7A">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -37,26 +37,6 @@
<segue destination="vXZ-lx-hvc" kind="presentation" id="13P-xr-xsw"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="57B-xw-pqD" style="IBUITableViewCellStyleDefault" id="53c-21-xAG">
<rect key="frame" x="0.0" y="108" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="53c-21-xAG" id="aBd-bQ-zTM">
<rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Audio (only) Streaming" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="57B-xw-pqD">
<rect key="frame" x="15" y="0.0" width="550" height="43.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="eX8-jW-Rxl" kind="presentation" id="lyD-HO-jU7"/>
</connections>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
Expand Down Expand Up @@ -172,57 +152,6 @@
</objects>
<point key="canvasLocation" x="1434" y="432"/>
</scene>
<!--Audio Streaming View Controller-->
<scene sceneID="KIC-fA-0BJ">
<objects>
<viewController id="eX8-jW-Rxl" customClass="PLAudioStreamingViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="9O8-K5-Naa"/>
<viewControllerLayoutGuide type="bottom" id="Zmd-dA-jhk"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="mn8-CM-6M5">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qaI-WN-JB2">
<rect key="frame" x="20" y="28" width="100" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="1Js-dn-dN2"/>
<constraint firstAttribute="height" constant="44" id="OfP-OT-Rx5"/>
</constraints>
<state key="normal" title="Cancel"/>
<connections>
<action selector="cancelButtonPressed:" destination="eX8-jW-Rxl" eventType="touchUpInside" id="R5c-tP-cvf"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5HO-fj-QVO">
<rect key="frame" x="250" y="536" width="100" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="AvO-05-VZc"/>
<constraint firstAttribute="width" constant="100" id="bqo-iD-qKy"/>
</constraints>
<state key="normal" title="Start"/>
<connections>
<action selector="actionButtonPressed:" destination="eX8-jW-Rxl" eventType="touchUpInside" id="oqx-00-iQn"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="5HO-fj-QVO" firstAttribute="centerX" secondItem="mn8-CM-6M5" secondAttribute="centerX" id="89S-mT-uVN"/>
<constraint firstItem="qaI-WN-JB2" firstAttribute="top" secondItem="9O8-K5-Naa" secondAttribute="bottom" constant="8" id="Zb1-wP-HFR"/>
<constraint firstItem="Zmd-dA-jhk" firstAttribute="top" secondItem="5HO-fj-QVO" secondAttribute="bottom" constant="20" id="mzY-Y9-dIx"/>
<constraint firstAttribute="leadingMargin" secondItem="qaI-WN-JB2" secondAttribute="leading" id="qsS-Tv-9Rs"/>
</constraints>
</view>
<connections>
<outlet property="actionButton" destination="5HO-fj-QVO" id="GgX-Pr-9hm"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="LfF-2v-hP7" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1434" y="1185"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="Xkl-di-VqO">
<objects>
Expand Down
4 changes: 2 additions & 2 deletions Example/PLCameraStreamingKit/Launch Screen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
Expand Down
15 changes: 0 additions & 15 deletions Example/PLCameraStreamingKit/PLAudioStreamingViewController.h
View file

This file was deleted.

168 changes: 0 additions & 168 deletions Example/PLCameraStreamingKit/PLAudioStreamingViewController.m
View file

This file was deleted.

24 changes: 18 additions & 6 deletions Example/PLCameraStreamingKit/PLCameraStreamingViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Unknow",
"Connecting",
"Connected",
"Disconnecting"
"Disconnecting",
"Disconnected",
"Error"
};
Expand Down Expand Up @@ -64,7 +64,23 @@ - (void)viewDidLoad {
// @"hosts": @{
// ...
// }
NSDictionary *streamJSON;
NSDictionary *streamJSON = @{@"id": @"z1.dayzhtest.plcamerastreamingkit-test",
@"title": @"plcamerastreamingkit-test",
@"hub": @"dayzhtest",
@"publishKey": @"123",
@"publishSecurity": @"static", // or static
@"disabled": @(NO),
@"profiles": @[], // or empty Array []
@"hosts": @{
@"publish": @{
@"rtmp": @"pili-publish.0dayzh.miclle.com"
},
@"play": @{
@"rtmp": @"pili-live-rtmp.0dayzh.miclle.com"
}
}
};

PLStream *stream = [PLStream streamWithJSON:streamJSON];

void (^permissionBlock)(void) = ^{
Expand Down Expand Up @@ -220,10 +236,6 @@ - (void)startSession {
self.actionButton.enabled = NO;
dispatch_async(self.sessionQueue, ^{
[self.session startWithCompleted:^(BOOL success) {
if (success) {
NSLog(@"Publish URL: %@", self.session.pushURL.absoluteString);
}

dispatch_async(dispatch_get_main_queue(), ^{
self.actionButton.enabled = YES;
});
Expand Down
Loading

0 comments on commit e5edc91

Please sign in to comment.