iOS Team / CNLivePlayerStreamerSDKDemo · Commits

Commit 291b340e338cd4c2ea0428cda63e7ba7b7e8cb9c

Authored by 朱林
2 parents 290d5944 2d274d00

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLivePlayerStreamerSDKDemo 

Conflicts:
	CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
	CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
	CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
	CNLivePlayerSDKTest/CNLivePlayerSDKTest/Player/CNLiveViewController.m
	CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
Inline Side-by-side
Showing 9 changed files with 25 additions and 10 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
View file @291b340
No preview for this file type
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveBeautifyFaceFilter.h
  View file @291b340
... ... @@ -11,7 +11,7 @@
11 11 #import <UIKit/UIKit.h>
12 12  
13 13 /**
14   - * 美颜（（默认旧美颜，参数为0.5））
  14 + * 美颜（（默认旧美颜，磨皮参数为0.5））
15 15 */
16 16  
17 17 @interface CNLiveBeautifyFaceFilter : NSObject
... ... @@ -19,11 +19,12 @@
19 19 /**
20 20 @abstract CNLiveBeautyTypeSpecial 美颜特效类型，需先设置CNLiveBeautyType为CNLiveBeautyTypeSpecial
21 21 */
22   -@property (nonatomic, assign) CNLiveSpecialEffects curEffectIdx; //美颜类型
  22 +- (void)setCurEffectIdx:(CNLiveSpecialEffects)curEffectIdx; //美颜特效类型
23 23  
24 24 /**
25 25 @abstract 美颜类型
26 26 @param beautyType 类型
  27 + @warn 旧美颜仅grindRatio参数可调节，另两个参数设置无效
27 28 */
28 29 - (void)setBeautyType:(CNLiveBeautyType)beautyType;
29 30  
... ...
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
  View file @291b340
... ... @@ -164,6 +164,14 @@ MP_EXTERN NSString *const MPMediaPlaybackIsPreparedToPlayDidChangeNotification N
164 164 */
165 165 - (BOOL)isPlaying;
166 166  
  167 +/*
  168 + * 指定播放器输出音量
  169 + * leftVolume left volume scalar [0~2.0f]
  170 + * rightVolume right volume scalar [0~2.0f]
  171 + * 输入参数超出范围将失效
  172 +*/
  173 +-(void)setVolume:(float)leftVolume rigthVolume:(float)rightVolume;
  174 +
167 175 /* 播放视频的当前时刻，单位为秒
168 176 *
169 177 * 视频正常播放时，如果改变currentPlaybackTime的值，将导致播放行为跳转到新的currentPlaybackTime位置播放
... ...
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveWebcastManager.h
  View file @291b340
... ... @@ -13,7 +13,6 @@
13 13 #import "CNLiveBeautifyFaceFilter.h"
14 14 #import "CNLiveAudioCapture.h"
15 15 #import <AVFoundation/AVFoundation.h>
16   -#import <UIKit/UIKit.h>
17 16  
18 17 @interface CNLiveWebcastManager : NSObject
19 18  
... ...
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
  View file @291b340
... ... @@ -7,6 +7,8 @@
7 7 objects = {
8 8  
9 9 /* Begin PBXBuildFile section */
  10 + 323609351E5436A200788D74 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */; };
  11 + 323609371E5436A600788D74 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
10 12 32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; };
11 13 32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; };
12 14 32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; };
... ... @@ -38,6 +40,7 @@
38 40 files = (
39 41 813916221E70114D00C55553 /* CNLivePlayerSDK.framework in Embed Frameworks */,
40 42 8142836A1E73F5A30035D5A6 /* CNLiveMsgTools.framework in Embed Frameworks */,
  43 + 323609371E5436A600788D74 /* CNLivePlayerSDK.framework in Embed Frameworks */,
41 44 );
42 45 name = "Embed Frameworks";
43 46 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -45,6 +48,7 @@
45 48 /* End PBXCopyFilesBuildPhase section */
46 49  
47 50 /* Begin PBXFileReference section */
  51 + 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
48 52 32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; };
49 53 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; };
50 54 32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; };
... ... @@ -85,6 +89,7 @@
85 89 files = (
86 90 813916211E70114D00C55553 /* CNLivePlayerSDK.framework in Frameworks */,
87 91 814283681E73F59B0035D5A6 /* CNLiveMsgTools.framework in Frameworks */,
  92 + 323609351E5436A200788D74 /* CNLivePlayerSDK.framework in Frameworks */,
88 93 );
89 94 runOnlyForDeploymentPostprocessing = 0;
90 95 };
... ... @@ -97,6 +102,7 @@
97 102 814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */,
98 103 813916181E70085A00C55553 /* KSYGPUResource.bundle */,
99 104 8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */,
  105 + 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */,
100 106 32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
101 107 32E6CA271D5B0AF400B58EBC /* Products */,
102 108 );
... ...
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Base.lproj/Main.storyboard
  View file @291b340
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="EpT-wO-Zba">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="EpT-wO-Zba">
  3 + <device id="retina4_7" orientation="portrait">
  4 + <adaptation id="fullscreen"/>
  5 + </device>
3 6 <dependencies>
4 7 <deployment identifier="iOS"/>
5   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
6 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7 10 </dependencies>
8 11 <scenes>
9   - <!--View Controller-->
  12 + <!--直播云 推流和播放SDK Demo-->
10 13 <scene sceneID="tne-QT-ifu">
11 14 <objects>
12 15 <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
... ... @@ -15,11 +18,11 @@
15 18 <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
16 19 </layoutGuides>
17 20 <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
18   - <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
  21 + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
19 22 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20 23 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
21 24 </view>
22   - <navigationItem key="navigationItem" id="MFb-0Q-P6h"/>
  25 + <navigationItem key="navigationItem" title="直播云 推流和播放SDK Demo" id="MFb-0Q-P6h"/>
23 26 </viewController>
24 27 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
25 28 </objects>
... ...
CNLivePlayerSDKTest/CNLivePlayerSDKTest/ViewController.m
  View file @291b340
... ... @@ -20,8 +20,6 @@
20 20 - (void)viewDidLoad {
21 21 [super viewDidLoad];
22 22  
23   - self.title = @"视讯云 推流和播放SDK Demo";
24   -
25 23 UIButton *playerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
26 24 playerBtn.frame = CGRectMake((CGRectGetWidth(self.view.frame)-150)/2, 100, 150, 50);
27 25 [playerBtn setTitle:@"播放" forState:UIControlStateNormal];
... ...
推流SDK文档.pdf
View file @291b340
No preview for this file type
播放SDK文档.pdf
View file @291b340
No preview for this file type