88
99#import " RoomViewController.h"
1010#import < QNRTCKit/QNRTCKit.h>
11+
12+ #warning 请到 Podifle 下，重新执行 pod install，确认 Pods/QNRTCKit-iOS/Pod/iphoneos 文件夹下，存在 FFmpeg.framework、QNRTCKit.framework 文件后可运行。
13+
1114@interface RoomViewController ()
1215<
1316QNRTCClientDelegate,
14- QNMicrophoneAudioTrackDataDelegate ,
15- QNCameraTrackVideoDataDelegate ,
16- QNRemoteTrackVideoDataDelegate ,
17- QNRemoteTrackAudioDataDelegate
17+ QNLocalAudioTrackDelegate ,
18+ QNLocalVideoTrackDelegate ,
19+ QNRemoteVideoTrackDelegate ,
20+ QNRemoteAudioTrackDelegate
1821>
1922@property (nonatomic , assign ) CGFloat screenWidth;
2023@property (nonatomic , assign ) CGFloat screenHeight;
@@ -32,7 +35,7 @@ @interface RoomViewController ()
3235@property (nonatomic , strong ) QNMicrophoneAudioTrack *audioTrack;
3336@property (nonatomic , strong ) QNCameraVideoTrack *cameraTrack;
3437
35- @property (nonatomic , strong ) QNGLKView *preview;
38+ @property (nonatomic , strong ) QNVideoGLView *preview;
3639@property (nonatomic , strong ) UIScrollView *scrollView;
3740@property (nonatomic , strong ) NSMutableArray *viewsArray;
3841@end
@@ -72,37 +75,38 @@ - (void)viewDidLoad {
7275#pragma mark - settings
7376
7477- (NSDictionary *)settingsArrayAtIndex : (NSInteger )index {
75- NSArray *settingsArray = @[@{@" VideoSize" CGSizeMake (288 , 352 )), @" FrameRate" 15 , @" Bitrate" 300 * 1000 )},
76- @{@" VideoSize" CGSizeMake (480 , 640 )), @" FrameRate" 15 , @" Bitrate" 400 * 1000 ) },
77- @{@" VideoSize" CGSizeMake (544 , 960 )), @" FrameRate" 15 , @" Bitrate" 700 * 1000 )},
78- @{@" VideoSize" CGSizeMake (720 , 1280 )), @" FrameRate" 20 , @" Bitrate" 1000 * 1000 )}];
78+ NSArray *settingsArray = @[@{@" VideoSize" CGSizeMake (288 , 352 )), @" FrameRate" 15 , @" Bitrate" 300 )},
79+ @{@" VideoSize" CGSizeMake (480 , 640 )), @" FrameRate" 15 , @" Bitrate" 400 ) },
80+ @{@" VideoSize" CGSizeMake (544 , 960 )), @" FrameRate" 15 , @" Bitrate" 700 )},
81+ @{@" VideoSize" CGSizeMake (720 , 1280 )), @" FrameRate" 20 , @" Bitrate" 1000 )}];
7982 return settingsArray[index];
8083}
8184
8285#pragma mark - QNRTCKit 核心类
8386
8487- (void )configureRTCEngine {
8588 // QNRTC 初始化
86- [QNRTC configRTC :defaultConfiguration ]];
89+ [QNRTC initRTC :defaultConfiguration ]];
8790
8891 // QNRTCClient 初始化
8992 self.rtcClient = [QNRTC createRTCClient ];
9093 self.rtcClient .delegate = self;
9194
9295 // 设置本地预览视图 显示在排列第一个
93- self.preview = [[QNGLKView alloc ] init ];
96+ self.preview = [[QNVideoGLView alloc ] init ];
9497 self.preview .frame = CGRectMake (0 , 0 , self.screenWidth /2 , self.screenHeight /2 );
9598 [self .scrollView addSubview: self .preview];
9699
97100 // 视频
98- QNCameraVideoTrackConfig * cameraConfig = [[QNCameraVideoTrackConfig alloc ] initWithSourceTag: @" camera" bitrate: self .kBitrate videoEncodeSize: self .videoEncodeSize];
101+ QNVideoEncoderConfig *videoConfig = [[QNVideoEncoderConfig alloc ] initWithBitrate: self .kBitrate videoEncodeSize: self .videoEncodeSize];
102+ QNCameraVideoTrackConfig * cameraConfig = [[QNCameraVideoTrackConfig alloc ] initWithSourceTag: @" camera" config: videoConfig];
99103 self.cameraTrack = [QNRTC createCameraVideoTrackWithConfig: cameraConfig];
100104 // 设置本地预览视图
101105 [self .cameraTrack play: self .preview];
102106
103107 // 设置采集视频的帧率
104108 self.cameraTrack .videoFrameRate = [self .settingsDic[@" FrameRate" integerValue ];
105- self.cameraTrack .videoDelegate = self;
109+ self.cameraTrack .delegate = self;
106110
107111 // 加入房间
108112 [self .rtcClient join: self .token];
@@ -114,7 +118,7 @@ - (void)configureRTCEngine {
114118 房间内状态变化的回调
115119 */
116120- (void )RTCClient : (QNRTCClient *)client didConnectionStateChanged : (QNConnectionState)state disconnectedInfo : (QNConnectionDisconnectedInfo *)info {
117- NSDictionary *connectionStateDictionary = @{@(QNConnectionStateIdle ) : @" Idle "
121+ NSDictionary *connectionStateDictionary = @{@(QNConnectionStateDisconnected ) : @" Disconnected "
118122 @(QNConnectionStateConnecting) : @" Connecting"
119123 @(QNConnectionStateConnected): @" Connected"
120124 @(QNConnectionStateReconnecting) : @" Reconnecting"
@@ -127,7 +131,7 @@ - (void)RTCClient:(QNRTCClient *)client didConnectionStateChanged:(QNConnectionS
127131 self.microphoneButton .selected = YES ;
128132 // 音频
129133 self.audioTrack = [QNRTC createMicrophoneAudioTrack ];
130- self.audioTrack .audioDelegate = self;
134+ self.audioTrack .delegate = self;
131135// [self.audioTrack setVolume:0.5];
132136
133137 // 发布音视频
@@ -142,7 +146,7 @@ - (void)RTCClient:(QNRTCClient *)client didConnectionStateChanged:(QNConnectionS
142146 NSLog (@" publish error: %@ "
143147 }
144148 }];
145- } else if (QNConnectionStateIdle == state) {
149+ } else if (QNConnectionStateDisconnected == state) {
146150 self.videoButton .enabled = NO ;
147151 self.videoButton .selected = NO ;
148152 } else if (QNConnectionStateReconnecting == state) {
@@ -175,11 +179,11 @@ - (void)RTCClient:(QNRTCClient *)client didSubscribedRemoteVideoTracks:(NSArray<
175179 NSLog (@" didSubscribedRemoteTracks - %d ,%d userTd %@ " count , videoTracks.count , userID);
176180 dispatch_async (dispatch_get_main_queue (), ^{
177181 for (QNRemoteAudioTrack * audioTrack in audioTracks) {
178- audioTrack.audioDelegate = self;
182+ audioTrack.delegate = self;
179183 }
180184 for (QNRemoteVideoTrack * videoTrack in videoTracks) {
181185 [videoTrack play: [self remoteUserView: userID]];
182- videoTrack.videoDelegate = self;
186+ videoTrack.delegate = self;
183187 }
184188 });
185189
@@ -217,25 +221,24 @@ - (void)RTCClient:(QNRTCClient *)client didReconnectedOfUserID:(NSString *)userI
217221 NSLog (@" didReconnectedOfUserID - %@ "
218222}
219223
220-
221- #pragma mark - QNRemoteTrackVideoDataDelegate
224+ #pragma mark - QNRemoteVideoTrackDelegate
222225- (void )remoteVideoTrack : (QNRemoteVideoTrack *)remoteVideoTrack didGetPixelBuffer : (CVPixelBufferRef)pixelBuffer {
223226 NSLog (@" remoteVideoTrack: %@ tag: %@ didGetPixelBuffer" trackID ,remoteVideoTrack.tag );
224227}
225228
226- #pragma mark - QNRemoteTrackAudioDataDelegate
229+ #pragma mark - QNRemoteAudioTrackDelegate
227230- (void )remoteAudioTrack : (QNRemoteAudioTrack *)remoteAudioTrack didGetAudioBuffer : (AudioBuffer *)audioBuffer bitsPerSample : (NSUInteger )bitsPerSample sampleRate : (NSUInteger )sampleRate {
228231 NSLog (@" remoteAudioTrack: %@ tag: %@ didGetAudioBuffer" trackID ,remoteAudioTrack.tag );
229232}
230233
231- #pragma mark - QNCameraTrackVideoDataDelegate
232- - (void )cameraVideoTrack : (QNCameraVideoTrack *)cameraVideoTrack didGetPixelBuffer : (CVPixelBufferRef)pixelBuffer {
234+ #pragma mark - QNLocalVideoTrackDelegate
235+ - (void )localVideoTrack : (QNLocalVideoTrack *)localVideoTrack didGetPixelBuffer : (CVPixelBufferRef)pixelBuffer {
233236// NSLog(@"cameraVideoTrack: %@ tag: %@ didGetPixelBuffer",cameraVideoTrack.trackID,track.tag);
234237
235238}
236239
237- #pragma mark - QNMicrophoneAudioTrackDataDelegate
238- - (void )microphoneAudioTrack : (QNMicrophoneAudioTrack *)microphoneAudioTrack didGetAudioBuffer : (AudioBuffer *)audioBuffer bitsPerSample : (NSUInteger )bitsPerSample sampleRate : (NSUInteger )sampleRate {
240+ #pragma mark - QNLocalAudioTrackDelegate
241+ - (void )localAudioTrack : (QNLocalAudioTrack *)localAudioTrack didGetAudioBuffer : (AudioBuffer *)audioBuffer bitsPerSample : (NSUInteger )bitsPerSample sampleRate : (NSUInteger )sampleRate {
239242// NSLog(@"microphoneAudioTrack: %@ tag: %@ didGetAudioBuffer",track.trackID,track.tag);
240243}
241244
@@ -253,9 +256,9 @@ - (void)layoutScrollView {
253256#pragma mark - 远端用户画面
254257#warning 考虑多个远端排列显示
255258
256- - (QNVideoView *)remoteUserView : (NSString *)userId {
259+ - (QNVideoGLView *)remoteUserView : (NSString *)userId {
257260 NSInteger count = self.viewsArray .count + 1 ;
258- QNVideoView *remoteView = [[QNVideoView alloc ] initWithFrame: CGRectMake (self .screenWidth/2 * (count%2 ), self .screenWidth/2 * (count/2 ), self .screenWidth/2 , self .screenWidth/2 )];
261+ QNVideoGLView *remoteView = [[QNVideoGLView alloc ] initWithFrame: CGRectMake (self .screenWidth/2 * (count%2 ), self .screenWidth/2 * (count/2 ), self .screenWidth/2 , self .screenWidth/2 )];
259262 [self .scrollView addSubview: remoteView];
260263
261264 UILabel *nameLabel = [[UILabel alloc ] initWithFrame: CGRectMake (0 , self .screenWidth/4 - 30 , self .screenWidth/2 , 60 )];
@@ -281,7 +284,7 @@ - (QNVideoView *)remoteUserView:(NSString *)userId {
281284- (void )removeRemoteRenderView : (NSString *)userId {
282285 NSInteger index = -1 ;
283286 for (NSInteger i = 0 ; i < self.viewsArray .count ; i++) {
284- QNVideoView *remoteView = self.viewsArray [i];
287+ QNVideoGLView *remoteView = self.viewsArray [i];
285288 UILabel *label = remoteView.subviews .lastObject ;
286289 if ([label.text isEqualToString: userId]) {
287290 [remoteView removeFromSuperview ];
@@ -292,7 +295,7 @@ - (void)removeRemoteRenderView:(NSString *)userId {
292295
293296 // 剔除离开的远端用户画面后，重新调整布局
294297 for (NSInteger i = 0 ; i < self.viewsArray .count ; i++) {
295- QNVideoView *remoteView = self.viewsArray [i];
298+ QNVideoGLView *remoteView = self.viewsArray [i];
296299 NSInteger count = i + 1 ;
297300 remoteView.frame = CGRectMake (self.screenWidth /2 * (count%2 ), self.screenWidth /2 * (count/2 ), self.screenWidth /2 , self.screenWidth /2 );
298301 }
@@ -319,12 +322,12 @@ - (void)closePublishAndBack:(UIButton *)button {
319322
320323- (void )videoButtonAction : (UIButton *)button {
321324 button.selected = !button.isSelected ;
322- [self .cameraTrack updataMute :
325+ [self .cameraTrack updateMute :
323326}
324327
325328- (void )microphoneButtonAction : (UIButton *)button {
326329 button.selected = !button.isSelected ;
327- [self .audioTrack updataMute :
330+ [self .audioTrack updateMute :
328331}
329332
330333- (void )cameraButtonAction : (UIButton *)button {
0 commit comments