李勇

增加最多可以显示音视频数量字段 maxMediaChannels;这个值就是最多现实音视频视图窗口的数量

@@ -27,7 +27,7 @@ import Server from "config/Server"; @@ -27,7 +27,7 @@ import Server from "config/Server";
27 import UTF8 from 'utf-8'; 27 import UTF8 from 'utf-8';
28 28
29 let loger = Loger.getLoger('McuClient'); 29 let loger = Loger.getLoger('McuClient');
30 -let _sdkInfo = {"version": "v1.11.3.20170504", "author": "www.3mang.com"}; 30 +let _sdkInfo = {"version": "v1.12.0.20170504", "author": "www.3mang.com"};
31 31
32 //APE 32 //APE
33 let _sass; 33 let _sass;
@@ -432,7 +432,7 @@ export default class MessageEntrance extends Emiter { @@ -432,7 +432,7 @@ export default class MessageEntrance extends Emiter {
432 432
433 GlobalConfig.maxVideoChannels = _data.maxVideoChannels; 433 GlobalConfig.maxVideoChannels = _data.maxVideoChannels;
434 GlobalConfig.maxAudioChannels = _data.maxAudioChannels; 434 GlobalConfig.maxAudioChannels = _data.maxAudioChannels;
435 - 435 + GlobalConfig.maxMediaChannels=Math.max(GlobalConfig.maxVideoChannels,GlobalConfig.maxAudioChannels);
436 //视频质量相关设置 436 //视频质量相关设置
437 GlobalConfig.fps = _data.fps || 15; 437 GlobalConfig.fps = _data.fps || 15;
438 GlobalConfig.gop = _data.gop || 3; 438 GlobalConfig.gop = _data.gop || 3;
@@ -740,6 +740,7 @@ export default class MessageEntrance extends Emiter { @@ -740,6 +740,7 @@ export default class MessageEntrance extends Emiter {
740 joinClassSuccessCallBackData.isHost = GlobalConfig.isHost; 740 joinClassSuccessCallBackData.isHost = GlobalConfig.isHost;
741 joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels; 741 joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels;
742 joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels; 742 joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels;
  743 + joinClassSuccessCallBackData.maxMediaChannels= GlobalConfig.maxMediaChannels;
743 joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay; 744 joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay;
744 745
745 joinClassSuccessCallBackData.msType = GlobalConfig.msType; 746 joinClassSuccessCallBackData.msType = GlobalConfig.msType;
@@ -1402,6 +1403,8 @@ export default class MessageEntrance extends Emiter { @@ -1402,6 +1403,8 @@ export default class MessageEntrance extends Emiter {
1402 joinClassSuccessCallBackData.isHost = GlobalConfig.isHost;// 1403 joinClassSuccessCallBackData.isHost = GlobalConfig.isHost;//
1403 joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels; 1404 joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels;
1404 joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels; 1405 joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels;
  1406 + joinClassSuccessCallBackData.maxMediaChannels = GlobalConfig.maxMediaChannels;
  1407 +
1405 joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay; 1408 joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay;
1406 1409
1407 joinClassSuccessCallBackData.msType = GlobalConfig.msType; 1410 joinClassSuccessCallBackData.msType = GlobalConfig.msType;
@@ -52,6 +52,7 @@ class GlobalConfig { @@ -52,6 +52,7 @@ class GlobalConfig {
52 classInfo.MCUServerPort=this.MCUServerPort; 52 classInfo.MCUServerPort=this.MCUServerPort;
53 classInfo.maxVideoChannels= this.maxVideoChannels; 53 classInfo.maxVideoChannels= this.maxVideoChannels;
54 classInfo.maxAudioChannels=this.maxAudioChannels; 54 classInfo.maxAudioChannels=this.maxAudioChannels;
  55 + classInfo.maxMediaChannels=this.maxMediaChannels;
55 classInfo.fps=this.fps; 56 classInfo.fps=this.fps;
56 classInfo.gop=this.gop; 57 classInfo.gop=this.gop;
57 classInfo.videoQuality=this.videoQuality; 58 classInfo.videoQuality=this.videoQuality;
@@ -306,8 +307,9 @@ GlobalConfig.DOCServerPort =""; @@ -306,8 +307,9 @@ GlobalConfig.DOCServerPort ="";
306 GlobalConfig.RecordServerIP =""; 307 GlobalConfig.RecordServerIP ="";
307 GlobalConfig.RecordServerPort =""; 308 GlobalConfig.RecordServerPort ="";
308 309
309 -GlobalConfig.maxVideoChannels=0;  
310 -GlobalConfig.maxAudioChannels=0; 310 +GlobalConfig.maxVideoChannels=0;//最大视频路数
  311 +GlobalConfig.maxAudioChannels=0;//最大音频路数
  312 +GlobalConfig.maxMediaChannels=0;//最大音视频路数,以音视频路数中的最大值为准
311 313
312 GlobalConfig.hasCamera=false;//摄像头是否可用 314 GlobalConfig.hasCamera=false;//摄像头是否可用
313 GlobalConfig.hasMicrophone=false;//麦克风是否可用 315 GlobalConfig.hasMicrophone=false;//麦克风是否可用