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

王军波
2 parents 5e7797c7 79f2d873
Showing 9 changed files with 305 additions and 20 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/CNLivePlayerSDK
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveAudioCapture.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveBgmPlayer.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveTypeDef.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveWebcastManager.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Info.plist
@@ -84,13 +84,14 @@
 		810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */; };
 		8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */; };
 		811BB6801E80F858005C6291 /* LVCChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB67D1E80F858005C6291 /* LVCChatView.m */; };
-		811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */; };
-		811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		811BB6881E8107B4005C6291 /* LVCChatViewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */; };
 		811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB68D1E8116C8005C6291 /* NSString+StringSize.m */; };
 		8128E2881E8A6A3600B40E75 /* CNBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2851E8A6A3600B40E75 /* CNBarrageManager.m */; };
 		8128E2891E8A6A3600B40E75 /* CNBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2871E8A6A3600B40E75 /* CNBarrageView.m */; };
 		8130911E1E84C0F0005F0BFF /* LVCMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8130911D1E84C0F0005F0BFF /* LVCMessage.m */; };
+		8157A0181EE1451800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; };
+		8157A0191EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; };
+		8157A01A1EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A1B9A81E8277410079FF5F /* LVCInputView.m */; };
 		81A482F51E88ACC80097A80A /* LVCTelevisionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F41E88ACC80097A80A /* LVCTelevisionView.m */; };
 		81A482F81E88AFA20097A80A /* LVCFirstHeaderReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F71E88AFA20097A80A /* LVCFirstHeaderReusableView.m */; };
@@ -287,7 +288,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				4BD8561A1EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
-				811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				8157A01A1EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 				D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */,
 				D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
@@ -455,7 +456,6 @@
 		8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPlayerLoadingView.m; sourceTree = "<group>"; };
 		811BB67C1E80F858005C6291 /* LVCChatView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatView.h; sourceTree = "<group>"; };
 		811BB67D1E80F858005C6291 /* LVCChatView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatView.m; sourceTree = "<group>"; };
-		811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 		811BB6861E8107B4005C6291 /* LVCChatViewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatViewTableViewCell.h; sourceTree = "<group>"; };
 		811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatViewTableViewCell.m; sourceTree = "<group>"; };
 		811BB68C1E8116C8005C6291 /* NSString+StringSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+StringSize.h"; sourceTree = "<group>"; };
@@ -466,6 +466,7 @@
 		8128E2871E8A6A3600B40E75 /* CNBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageView.m; sourceTree = "<group>"; };
 		8130911C1E84C0F0005F0BFF /* LVCMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMessage.h; sourceTree = "<group>"; };
 		8130911D1E84C0F0005F0BFF /* LVCMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMessage.m; sourceTree = "<group>"; };
+		8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 		81A1B9A71E8277410079FF5F /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
 		81A1B9A81E8277410079FF5F /* LVCInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInputView.m; sourceTree = "<group>"; };
 		81A482F31E88ACC80097A80A /* LVCTelevisionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCTelevisionView.h; path = LiveVideoCloud/Classes/Sections/homeSections/View/LVCTelevisionView.h; sourceTree = SOURCE_ROOT; };
@@ -812,12 +813,13 @@
 				4BD855D31EBAC8B20082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				D2994BA71E8F48DE00E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
+				8157A0181EE1451800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
 				D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
 				4BD856191EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
-				811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */,
 				D2994BA61E8F48DE00E8D2CC /* CNLiveChatManager.framework in Frameworks */,
 				D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */,
+				8157A0191EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1104,9 +1106,9 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */,
 				D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */,
 				D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */,
-				811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
 			);
 			path = CNLiveSDK;
@@ -26,7 +26,13 @@
  @abstract  设置mic采集的声音音量
  @discussion 调整范围 0.0~1.0
  */
-@property(nonatomic, assign) Float32 micVolume;
+@property(nonatomic, assign) float micVolume;
+
+/**
+ @abstract  设置耳返音量
+ @discussion 调整范围 0.0~1.0
+ */
+@property(nonatomic, assign) Float32 bPlayVolume;
  
 /**
  @abstract 混响类型
@@ -40,4 +46,16 @@
 */
 @property(nonatomic, assign) int reverbType;
  
+/**
+ @abstract 音效类型
+ @discussion 目前提供了4种音效类型, type和音效的对应关系如下
+ 
+ - 0 关闭
+ - 1 大叔
+ - 2 萝莉
+ - 3 庄严
+ - 4 机器人
+ */
+@property (nonatomic, assign) int audioEffectType;
+
 @end
+//
+//  CNLiveBgmPlayer.h
+//  CNLivePlayerSDKDemo
+//
+//  Created by iOS on 17/4/18.
+//  Copyright © 2017年 雷浩杰. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+#import "CNLiveTypeDef.h"
+
+@interface CNLiveBgmPlayer : NSObject
+
+/**
+ @abstract   开始播放背景音乐
+ @param      path 本地音乐的路径
+ @param      loop 是否循环播放此音乐
+ @return     是否能够开始播放
+ */
+- (BOOL) startPlayBgm:(NSString*) path
+               isLoop:(BOOL) loop;
+/**
+ @abstract   停止播放背景音乐
+ */
+- (void) stopPlayBgm;
+/**
+ @abstract   暂停播放背景音乐
+ */
+- (void) pauseBgm;
+/**
+ @abstract   恢复播放背景音乐
+ */
+- (void) resumeBgm;
+
+/**
+ @abstract  seek到指定时间 (拖动进度条)
+ @param     time 时间, 请参考 bgmDuration (单位,秒)
+ @return    是否seek 成功
+ */
+- (BOOL) seekToTime:(float)time;
+
+/**
+ @abstract  seek到指定进度 (拖动进度条)
+ @param     prog 进度, 请参考 bgmProgress
+ @return    是否seek 成功
+ */
+- (BOOL) seekToProgress:(float)prog;
+
+/**
+ @abstract   背景音乐的音量
+ @discussion 调整范围 0.0~1.0
+ @discussion 仅仅调整播放的音量, 不影响回调的音频数据
+ */
+@property (nonatomic, assign) double bgmVolume;
+
+/**
+ @abstract   播放声音的音调
+ @discussion 调整范围 [-24.0 ~ 24.0], 默认为0.01, 单位为半音
+ @discussion 0.01 为1度, 1.0为一个半音, 12个半音为1个八度
+ */
+@property (nonatomic, assign) double bgmPitch;
+
+/**
+ @abstract   背景音乐播放静音
+ @discussion 仅仅静音播放, 不影响回调的音频数据
+ */
+@property (nonatomic, assign) BOOL bMutBgmPlay;
+
+#pragma mark - callbacks
+/**
+ @abstract   音频数据输出回调
+ @discussion sampleBuffer 从音乐文件中解码得到的PCM数据
+ */
+@property(nonatomic, copy) BOOL (^cnBgmAudioDataBlock)(uint8_t** pData, int len, const AudioStreamBasicDescription* fmt, CMTime pts);
+
+/**
+ @abstract   当背景音乐播放完成时，调用此回调函数
+ @discussion 只有设置 loop为NO时才有效, 在开始播放前设置有效
+ */
+@property(nonatomic, copy) void(^cnBgmFinishBlock)(void);
+
+#pragma mark - player state
+/**
+ @abstract    背景音的duration信息（总时长, 单位:秒）
+ */
+@property (nonatomic, readonly) float bgmDuration;
+
+/**
+ @abstract    背景音的已经播放长度 (单位:秒)
+ @discussion  从0开始，最大为bgmDuration长度
+ */
+@property (nonatomic, readonly) float bgmPlayTime;
+
+/**
+ @abstract    音频的播放进度
+ @discussion  取值从0.0~1.0，大小为bgmPlayTime/bgmDuration;
+ */
+@property (nonatomic, readonly) float bgmProcess;
+
+/**
+ @abstract    音频播放是否运行
+ @discussion  音频是否输出到speaker播放
+ */
+@property (nonatomic, readonly) BOOL isRunning;
+
+/**
+ @abstract    播放错误码
+ @discussion  播放错误码具体内容可以参考AudioQueue的Apple文档。
+ */
+@property (nonatomic, readonly) OSStatus audioErrorCode;
+
+/**
+ @abstract    播放状态
+ */
+@property (nonatomic, readonly) CNLiveBgmPlayerState bgmPlayerState;
+
+/**
+ @abstract    单曲循环
+ */
+@property (nonatomic, assign) BOOL bLoop;
+
+// Posted when audio state changes
+FOUNDATION_EXPORT NSString *const CNLiveBgmAudioStateDidChangeNotification NS_AVAILABLE_IOS(7_0);
+
+@end
@@ -9,22 +9,39 @@
 #import <Foundation/Foundation.h>
 #import "CNLiveWebcastManager.h"
 #import <AVFoundation/AVFoundation.h>
+#import "CNLiveBgmPlayer.h"
  
 @interface CNLiveGPUStreamerKit : NSObject
  
 #pragma mark - 使用视讯云平台
  
 /**
- @abstract      初始化
+ @abstract      初始化(不会打断其他后台的音乐播放)
  @warning       实例化的对象必须赋值给一个全局变量
- @param         activityId              活动ID，确保SP下的唯一性
- @param         channelId               主播ID
- @param         isHorizontalScreen      屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1
+ @param         pureAudioMode           YES:纯音频推流
  @warning       必传参数
  */
--(instancetype)initWithDefaultConfigWithActivityId:(NSString *)activityId
-                                    channelId:(NSString *)channelId
-                           isHorizontalScreen:(NSString *)isHorizontalScreen;
+-(instancetype)initCNLiveKitWithDefaultConfigWithPureAudioMode:(BOOL)mode;
+
+/**
+ @abstract      初始化(会打断其他后台的音乐播放)
+ @warning       实例化的对象必须赋值给一个全局变量
+ @param         pureAudioMode           YES:纯音频推流
+ @warning       必传参数
+ */
+-(instancetype)initCNLiveKitWithInterruptConfigWithPureAudioMode:(BOOL)mode;
+
+/**
+ @abstract      活动ID，确保SP下的唯一性
+ @discussion    必传参数
+ */
+@property (nonatomic, strong) NSString *activityId;
+
+/**
+ @abstract      主播ID
+ @discussion    必传参数
+ */
+@property (nonatomic, strong) NSString *channelId;
  
 /**
  @abstract      是否开启控制台输出日志
@@ -33,6 +50,11 @@
 @property (nonatomic, assign) BOOL logPrintEnable;
  
 /**
+ @abstract      屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为0
+ */
+@property (nonatomic, assign) BOOL isHorizontalScreen;
+
+/**
  @abstract      活动名称（非必传）
  */
 @property (nonatomic, strong) NSString *activityName;
@@ -74,17 +96,34 @@
  
 /**
  @abstract      启动推流
- @warning       鉴权成功后开启推流
+ @warning       鉴权成功后开启推流（SDK内部创建活动并开启推流）
+ */
+- (void)startStream:(void (^)(void))successBlock  failure:(void (^)(NSDictionary *errorDic))failureBlock;
+
+/**
+ @abstract      启动推流
+ @param         url           推流地址
+ @param         activityId    活动ID
+ @warning       后台创建活动完成，开启推流（仅视讯云平台有效）
  */
-- (void) startStream:(void (^)(void))successBlock  failure:(void (^)(NSDictionary *errorDic))failureBlock;
+- (void)startStreamWithUrl:(NSString *)url activityId:(NSString *)activityId success:(void (^)(void))successBlock  failure:(void (^)(NSDictionary *errorDic))failureBlock;
+
  
 #pragma mark - 普通推流
  
 /**
- @abstract      初始化
+ @abstract      初始化(不会打断其他后台的音乐播放)
+ @param         mode           YES:纯音频推流
+ @warning       实例化的对象必须赋值给一个全局变量
+ */
+-(instancetype)initWithDefaultConfigWithPureAudioMode:(BOOL)mode;
+
+/**
+ @abstract      初始化(会打断其他后台的音乐播放)
+ @param         mode           YES:纯音频推流
  @warning       实例化的对象必须赋值给一个全局变量
  */
--(instancetype)initWithDefaultConfig;
+-(instancetype)initWithInterruptConfigWithPureAudioMode:(BOOL)mode;
  
 /**
  @abstract   获取水印工具
@@ -108,6 +147,11 @@
  */
 @property (nonatomic, readonly) CNLiveBeautifyFaceFilter *beautifyFaceFilter;
  
+/**
+ @abstract   背景音乐工具
+ */
+@property (nonatomic, readonly) CNLiveBgmPlayer *bgmPlayer;
+
 #pragma mark - capture & preview settings
  
 /**
@@ -187,6 +231,37 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 @property (nonatomic, readonly) CNLiveStreamErrorCode streamErrorCode;
  
+#pragma mark - reconnect
+/**
+ @abstract 自动重连次数 关闭(0), 开启(>0), 默认为0
+ @discussion 当内部发现推流错误后, 会在一段时间后尝试重连
+ 自动重连不会重新获取推流地址, 仍然使用上次推流的地址
+ @warning  如果在推流地址有过期时间, 请勿开启
+ */
+@property (nonatomic, assign) int          maxAutoRetry;
+
+/**
+ @abstract 自动重连延时, 发现连接错误后, 重试的延时
+ @discussion 单位为秒, 默认为2s, 最小值为0.1s
+ */
+@property (nonatomic, assign) double          autoRetryDelay;
+
+/**
+ @abstract 视讯云平台下重连状态（普通推流无效）
+ */
+@property (nonatomic, assign) CNLiveReconnectStatus reconnectStatus;
+
+/**
+ @abstract 自动重连失败通知（注*仅视讯云平台有效，普通方法推流自动重连失败收不到该通知）
+ @discussion 仅推流错误码为 CNLiveStreamErrorCode_CONNECT_BREAK、
+                        CNLiveStreamErrorCode_AV_SYNC_ERROR、
+                        CNLiveStreamErrorCode_Connect_Server_failed、
+                        CNLiveStreamErrorCode_DNS_Parse_failed、
+                        CNLiveStreamErrorCode_CODEC_OPEN_FAILED、
+                        CNLiveStreamErrorCode_ABNORMAL 时为可重连状态；
+ */
+FOUNDATION_EXPORT NSString *const CNLiveStreamReconnectStatusChangedNotification NS_AVAILABLE_IOS(7_0);
+
 /**
  @abstract      切换摄像头
  @return        TRUE: 成功切换摄像头，开启预览后设置有效
@@ -237,6 +312,18 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
 - (void) stopStream;
  
 /**
+ @abstract      开始录制本地视频(不支持边推边录)
+ @param         path        本地存储路径
+ */
+- (void)startRecordWithFilePath:(NSString *)path;
+
+/**
+ @abstract      停止录制本地视频
+ @discussion    与 - (void)startRecordWithFilePath: 搭配使用
+ */
+- (void)stopRecord;
+
+/**
  @abstract   进入后台: 暂停图像采集
  @discussion 暂停图像采集和预览
  */
@@ -248,6 +335,11 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 - (void) appBecomeActive;
  
+/**
+ @abstract   退出推流页面时调用
+ */
+- (void)quitStreaming;
+
 #pragma mark -  mirror & rotate
  
 /**
@@ -290,4 +382,5 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 @property (nonatomic, assign)   CGFloat pinchZoomFactor;
  
+
 @end
@@ -72,6 +72,11 @@
  */
 - (void)retryToGetAnchorStatusResult:(void(^)(BOOL result))result;
  
+/**
+ *  销毁播放器
+ */
+- (void)destroyPlayer;
+
 /* 主播直播状态(只读)
  *
  */
@@ -11,7 +11,7 @@
  
 #pragma mark - Video Dimension
  
-/// 采集分辨率
+/// 采集分辨率（弃用）
 typedef NS_ENUM(NSUInteger, CNLiveVideoDimension) {
     /// 16 : 9 宽高比，1280 x 720 分辨率
     CNLiveVideoDimension_16_9__1280x720 = 0,
@@ -146,6 +146,13 @@ typedef NS_ENUM(NSUInteger, CNLiveStreamErrorCode) {
 };
  
 #pragma mark - 美颜
+typedef NS_ENUM(NSUInteger, CNLiveReconnectStatus) {
+    CNLiveReconnectStatusStart = 0,
+    CNLiveReconnectStatusSuccess,
+    CNLiveReconnectStatusFailed
+};
+
+#pragma mark - 美颜
  
 typedef NS_ENUM(NSUInteger, CNLiveBeautyType) {
     ///无
@@ -170,7 +177,39 @@ typedef NS_ENUM(NSUInteger, CNLiveSpecialEffects) {
     ///蓝调
     CNLiveSpecialEffectsBlues,
     ///老照片
-    CNLiveSpecialEffectsOldPicture
+    CNLiveSpecialEffectsOldPicture,
+    ///樱花
+    CNLiveSpecialEffectsCherry,
+    ///樱花（光线较暗）
+    CNLiveSpecialEffectsCherryDark,
+    ///红润（光线较暗）
+    CNLiveSpecialEffectsRuddyDark,
+    ///阳光（光线较暗）
+    CNLiveSpecialEffectsSunlightDark,
+    ///红润
+    CNLiveSpecialEffectsRuddy,
+    ///阳光
+    CNLiveSpecialEffectsSunlight,
+    ///自然
+    CNLiveSpecialEffectsNature
+};
+
+#pragma mark - 音频播放状态
+typedef NS_ENUM(NSUInteger, CNLiveBgmPlayerState) {
+    /// 初始状态
+    CNLiveBgmPlayerStateInit,
+    /// 背景音正在播放
+    CNLiveBgmPlayerStateStarting,
+    /// 背景音停止
+    CNLiveBgmPlayerStateStopped,
+    /// 背景音正在播放
+    CNLiveBgmPlayerStatePlaying,
+    /// 背景音暂停
+    CNLiveBgmPlayerStatePaused,
+    /// 背景音播放出错
+    CNLiveBgmPlayerStateError,
+    /// 背景音被打断
+    CNLiveBgmPlayerStateInterrupted
 };
  
 #pragma mark - player
@@ -14,6 +14,7 @@
 #import "CNLiveAudioCapture.h"
 #import "CNLiveGPUStreamerKit.h"
 #import "CNLiveMoviePlayerController.h"
+#import "CNLiveBgmPlayer.h"
  
 @interface CNLiveWebcastManager : NSObject
  
@@ -42,4 +43,5 @@
  */
 + (NSString *)getVersion;
  
+
 @end