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

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
朱林
2 parents 290d5944 2d274d00
Showing 9 changed files with 25 additions and 10 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveBeautifyFaceFilter.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveWebcastManager.h
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Base.lproj/Main.storyboard
CNLivePlayerSDKTest/CNLivePlayerSDKTest/ViewController.m
推流SDK文档.pdf
播放SDK文档.pdf
@@ -11,7 +11,7 @@
 #import <UIKit/UIKit.h>
 /**
- *  美颜（（默认旧美颜，参数为0.5））
+ *  美颜（（默认旧美颜，磨皮参数为0.5））
  */
 @interface CNLiveBeautifyFaceFilter : NSObject
@@ -19,11 +19,12 @@
 /**
  @abstract   CNLiveBeautyTypeSpecial 美颜特效类型，需先设置CNLiveBeautyType为CNLiveBeautyTypeSpecial
  */
-@property (nonatomic, assign) CNLiveSpecialEffects curEffectIdx;   //美颜类型
+- (void)setCurEffectIdx:(CNLiveSpecialEffects)curEffectIdx;   //美颜特效类型
 /**
  @abstract          美颜类型
  @param beautyType  类型
+ @warn  旧美颜仅grindRatio参数可调节，另两个参数设置无效
  */
 - (void)setBeautyType:(CNLiveBeautyType)beautyType;
@@ -164,6 +164,14 @@ MP_EXTERN NSString *const MPMediaPlaybackIsPreparedToPlayDidChangeNotification N
  */
 - (BOOL)isPlaying;
+/*
+ * 指定播放器输出音量
+ * leftVolume  left volume scalar  [0~2.0f]
+ * rightVolume right volume scalar [0~2.0f]
+ * 输入参数超出范围将失效
+*/
+-(void)setVolume:(float)leftVolume rigthVolume:(float)rightVolume;
+
 /* 播放视频的当前时刻，单位为秒
  *
  * 视频正常播放时，如果改变currentPlaybackTime的值，将导致播放行为跳转到新的currentPlaybackTime位置播放
@@ -13,7 +13,6 @@
 #import "CNLiveBeautifyFaceFilter.h"
 #import "CNLiveAudioCapture.h"
 #import <AVFoundation/AVFoundation.h>
-#import <UIKit/UIKit.h>
 @interface CNLiveWebcastManager : NSObject
@@ -7,6 +7,8 @@
 	objects = {
 /* Begin PBXBuildFile section */
+		323609351E5436A200788D74 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */; };
+		323609371E5436A600788D74 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 323609341E5436A200788D74 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; };
 		32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; };
 		32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; };
@@ -38,6 +40,7 @@
 			files = (
 				813916221E70114D00C55553 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 				8142836A1E73F5A30035D5A6 /* CNLiveMsgTools.framework in Embed Frameworks */,
+				323609371E5436A600788D74 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -45,6 +48,7 @@
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
+		323609341E5436A200788D74 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 		32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; };
 		32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; };
 		32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; };
@@ -85,6 +89,7 @@
 			files = (
 				813916211E70114D00C55553 /* CNLivePlayerSDK.framework in Frameworks */,
 				814283681E73F59B0035D5A6 /* CNLiveMsgTools.framework in Frameworks */,
+				323609351E5436A200788D74 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -97,6 +102,7 @@
 				814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */,
 				813916181E70085A00C55553 /* KSYGPUResource.bundle */,
 				8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */,
+				323609341E5436A200788D74 /* CNLivePlayerSDK.framework */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
 				32E6CA271D5B0AF400B58EBC /* Products */,
 			);
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--View Controller-->
+        <!--直播云 推流和播放SDK Demo-->
         <scene sceneID="tne-QT-ifu">
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
@@ -15,11 +18,11 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
-                    <navigationItem key="navigationItem" id="MFb-0Q-P6h"/>
+                    <navigationItem key="navigationItem" title="直播云 推流和播放SDK Demo" id="MFb-0Q-P6h"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
@@ -20,8 +20,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"视讯云 推流和播放SDK Demo";
-    
     UIButton *playerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     playerBtn.frame = CGRectMake((CGRectGetWidth(self.view.frame)-150)/2, 100, 150, 50);
     [playerBtn setTitle:@"播放" forState:UIControlStateNormal];