Merge pull request #83 from ShengQiangLiu/v6.1.0-release

release v6.1.0

APIDiffs/api-diffs-6.1.0.md

@@ -0,0 +1,2 @@
+# QNRTCKit 5.2.7 to 6.0.0 API Differences
+# None

Pod/iphoneos/QNRTCKit.framework.dSYM/Contents/Info.plist

@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>6.0.0</string>
+		<string>6.1.0</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

Pod/iphoneos/QNRTCKit.framework/Headers/QNRTCKit.h

@@ -47,6 +47,7 @@ FOUNDATION_EXPORT const unsigned char QNRTCKitVersionString[];
 #import <QNRTCKit/QNClientConfig.h>
 #import <QNRTCKit/QNAudioMusicMixer.h>
 #import <QNRTCKit/QNAudioEffectMixer.h>
+#import <QNRTCKit/QNAudioSourceMixer.h>
 #import <QNRTCKit/QNAudioVolumeInfo.h>
 #import <QNRTCKit/QNCDNStreamingClient.h>
 

Pod/iphoneos/QNRTCKit.framework/Headers/QNTrack.h

@@ -159,7 +159,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  * @abstract 本地音频扩展数据回调代理。
  *
- * @since v5.2.7
+ * @since v6.0.0
  */
 @property (nonatomic, weak) id<QNAudioEncryptDelegate> encryptDelegate;
 
@@ -821,7 +821,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  * @abstract 远端音频 Track 扩展数据回调代理。
  *
- * @since v5.2.7
+ * @since v6.0.0
  */
 @property (nonatomic, weak) id<QNAudioDecryptDelegate> decryptDelegate;
 

Pod/iphoneos/QNRTCKit.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module QNRTCKit {
   umbrella header "QNRTCKit.h"
-
   export *
+
   module * { export * }
 }

Pod/iphoneos/QNRTCKit.framework/_CodeSignature/CodeResources

@@ -106,7 +106,7 @@
 		</data>
 		<key>Headers/QNRTCKit.h</key>
 		<data>
-		4ucrGPnojLlGRgzAjCSEQf8Igwc=
+		9p6yJJdR/I0hR9Svfq3IXg7+NCI=
 		</data>
 		<key>Headers/QNRTCLogConfiguration.h</key>
 		<data>
@@ -138,7 +138,7 @@
 		</data>
 		<key>Headers/QNTrack.h</key>
 		<data>
-		M4N+HItszuclWsiglKHNHrsHEVI=
+		83ODbziho0RU0yOVTTBQBzFGdv0=
 		</data>
 		<key>Headers/QNTranscodingLiveStreamingConfig.h</key>
 		<data>
@@ -170,11 +170,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		ccbcvcE3XLUVPsi5wyKuGBL16dQ=
+		EgDiCIM1aW0/Bw1iFwhYHl7zhj0=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		V62wBJhk826ZdAg9jEeR4cmaBaY=
+		4+rT97wuksacNvWOLVCxzcKtyqA=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -358,7 +358,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			S+5BrgvlQio6LJkgoGh1QzEJfGba1OWB9BIvzinuUEU=
+			wBleqdbZMMxGgnGYwbtUN/P2UK9lxXWNRJoiqMDY3zw=
 			</data>
 		</dict>
 		<key>Headers/QNRTCLogConfiguration.h</key>
@@ -414,7 +414,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			BJoxK3Hd/h8DdieuDe4VNtMCiCbKjKt4uZk8wxUkvI4=
+			J+WaHCoRV0yuDXyM3MkJeSTm1vDjowoR146w+v3l7j4=
 			</data>
 		</dict>
 		<key>Headers/QNTranscodingLiveStreamingConfig.h</key>
@@ -470,7 +470,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			/A+zB24lc7qlH1vJi67+CkjESZL9rqmpl37uC6CipxI=
+			umVaKnEqxfwX3rdebNhkhAkf4dpERz7wIIzHcd6CAKM=
 			</data>
 		</dict>
 	</dict>

Pod/universal/QNRTCKit.framework.dSYM/Contents/Info.plist

@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>5.2.6</string>
+		<string>6.1.0</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

Pod/universal/QNRTCKit.framework/Headers/QNAudioEffectMixer.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "QNTypeDefines.h"
+#import "QNAudioFilterProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -121,7 +122,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)audioEffect:(QNAudioEffect *)audioEffect didFinished:(int)effectID;
 @end
 
-@interface QNAudioEffectMixer : NSObject
+@interface QNAudioEffectMixer : NSObject <QNAudioFilterProtocol>
 
 /*!
  * @abstract 创建音效类

Pod/universal/QNRTCKit.framework/Headers/QNAudioFilterProtocol.h

@@ -0,0 +1,52 @@
+//
+//  QNAudioFilterProtocol.h
+//  QNRTCKit
+//
+//  Created by ShengQiang'Liu on 2023/8/22.
+//  Copyright © 2023 Pili Engineering, Qiniu Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "QNAudioFrame.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol QNAudioFilterProtocol <NSObject>
+
+/**
+ * Audio frame 处理.
+ * @param inAudioFrame 需要处理的 audio frame.
+ * @param adaptedFrame 处理完的 audio frame.
+ * @return
+ * - `true`: Success.
+ * - `false`: Failure. 丢弃 audio frame.
+ */
+- (BOOL)adaptAudioFrame:(const QNAudioFrame *)inAudioFrame adaptedFrame:(QNAudioFrame *)adaptedFrame;
+
+/**
+ * 获取 QNAudioFilter 类的标识名称
+ *
+ * @return
+ * - 标识名称
+ */
+- (const NSString *)getName;
+
+/**
+ * 开启或者关闭当前 filter.
+ * @param enable 是否开启 filter:
+ * - `true`: 开启.
+ * - `false`: 关闭.
+ */
+- (void)setEnabled:(BOOL)enable;
+
+/**
+ * 检查当前 Filter 是否开启.
+ * @return
+ * - `true`: 已开启.
+ * - `false`: 已关闭.
+ */
+- (BOOL)isEnabled;
+
+@end
+
+NS_ASSUME_NONNULL_END

Pod/universal/QNRTCKit.framework/Headers/QNAudioFrame.h

@@ -0,0 +1,33 @@
+//
+//  QNAudioFrame.h
+//  QNRTCKit
+//
+//  Created by ShengQiang'Liu on 2023/9/7.
+//  Copyright © 2023 Pili Engineering, Qiniu Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+enum QNBytesPerSample {
+  kTwoBytesPerSample = 2,
+};
+
+// Stereo, 32 kHz, 120 ms (2 * 32 * 120)
+static const int kQNMaxDataSizeSamples = 7680;
+static const int kQNMaxDataSizeBytes = kQNMaxDataSizeSamples * sizeof(int16_t);
+
+@interface QNAudioFrame : NSObject
+
+@property (nonatomic, assign) uint32_t captureTimestamp;
+@property (nonatomic, assign) size_t samplesPerChannel;
+@property (nonatomic, assign) int sampleRateHz;
+@property (nonatomic, assign) size_t numChannels;
+@property (nonatomic, assign, readonly) enum QNBytesPerSample bytePerSample;
+// 最大 size 为 kQNMaxDataSizeBytes
+@property (nonatomic, strong) NSData *data;
+
+@end
+
+NS_ASSUME_NONNULL_END

Pod/universal/QNRTCKit.framework/Headers/QNAudioMusicMixer.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "QNTypeDefines.h"
+#import "QNAudioFilterProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -53,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
-@interface QNAudioMusicMixer : NSObject
+@interface QNAudioMusicMixer : NSObject <QNAudioFilterProtocol>
 
 /*!
  * @abstract 设置是否推送到远端

Pod/universal/QNRTCKit.framework/Headers/QNAudioSourceMixer.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "QNTypeDefines.h"
+#import "QNAudioFilterProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -41,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface QNAudioSourceMixer : NSObject
+@interface QNAudioSourceMixer : NSObject <QNAudioFilterProtocol>
 
 /*!
  * @abstract 创建音源类，默认关闭阻塞模式

Pod/universal/QNRTCKit.framework/Headers/QNAudioVolumeInfo.h

@@ -0,0 +1,29 @@
+//
+//  QNAudioVolumeInfo.h
+//  QNRTCKit
+//
+//  Created by 冯文秀 on 2023/5/18.
+//  Copyright © 2023 Pili Engineering, Qiniu Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QNAudioVolumeInfo : NSObject
+/*!
+ * @abstract 用户 ID
+ *
+ * @since v5.2.3
+ */
+@property (nonatomic, readonly) NSString *userID;
+
+/*!
+ * @abstract 用户实时音量
+ *
+ * @since v5.2.3
+ */
+@property (nonatomic, readonly) float volume;
+@end
+
+NS_ASSUME_NONNULL_END

Pod/universal/QNRTCKit.framework/Headers/QNCDNStreamingClient.h

@@ -0,0 +1,80 @@
+//
+//  QNCDNStreamingClient.h
+//  QNRTCKit
+//
+//  Created by ShengQiang'Liu on 2023/11/6.
+//  Copyright © 2023 Pili Engineering, Qiniu Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "QNTypeDefines.h"
+#import "QNCDNStreamingConfig.h"
+#import "QNCDNStreamingStats.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class QNCDNStreamingClient;
+
+@protocol QNCDNStreamingDelegate <NSObject>
+
+/*!
+ * @abstract 推流状态回调
+ *
+ * @param client 推流实例
+ * @param state 推流状态
+ * @param code 错误码，请参考 QNErrorCode
+ * @param message 描述信息
+ *
+ * @since v6.0.0
+ */
+- (void)cdnStreamingClient:(QNCDNStreamingClient *)client didCDNStreamingConnectionStateChanged:(QNConnectionState)state
+                 errorCode:(int)code
+                   message:(NSString *)message;
+
+/*!
+ * @abstract 推流统计信息回调
+ *
+ * @param stats 统计信息
+ * @see QNCDNStreamingStats.
+ *
+ * @since v6.0.0
+ */
+- (void)cdnStreamingClient:(QNCDNStreamingClient *)client didCDNStreamingStats:(QNCDNStreamingStats *)stats;
+
+@end
+
+@interface QNCDNStreamingClient : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
+/*!
+ * @abstract 设置推流回调的监听
+ *
+ * @see QNCDNStreamingDelegate.
+ *
+ * @since v6.0.0
+ */
+@property (nonatomic, weak) id<QNCDNStreamingDelegate> delegate;
+
+/*!
+ * @abstract 开始推流到 CDN
+ *
+ * @param config 推流参数配置。
+ * @see QNCDNStreamingConfig.
+ * @return 请参考 QNErrorCode
+ *
+ * @since v6.0.0
+ */
+- (int)startWithConfig:(QNCDNStreamingConfig *)config;
+
+/*!
+ * @abstract 停止推流到 CDN
+ *
+ * @since v6.0.0
+ * @return 请参考 QNErrorCode
+ */
+- (int)stop;
+
+@end
+
+NS_ASSUME_NONNULL_END