李勇

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

... ... @@ -27,7 +27,7 @@ import Server from "config/Server";
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = {"version": "v1.11.3.20170504", "author": "www.3mang.com"};
let _sdkInfo = {"version": "v1.12.0.20170504", "author": "www.3mang.com"};
//APE
let _sass;
... ... @@ -432,7 +432,7 @@ export default class MessageEntrance extends Emiter {
GlobalConfig.maxVideoChannels = _data.maxVideoChannels;
GlobalConfig.maxAudioChannels = _data.maxAudioChannels;
GlobalConfig.maxMediaChannels=Math.max(GlobalConfig.maxVideoChannels,GlobalConfig.maxAudioChannels);
//视频质量相关设置
GlobalConfig.fps = _data.fps || 15;
GlobalConfig.gop = _data.gop || 3;
... ... @@ -740,6 +740,7 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData.isHost = GlobalConfig.isHost;
joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels;
joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels;
joinClassSuccessCallBackData.maxMediaChannels= GlobalConfig.maxMediaChannels;
joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay;
joinClassSuccessCallBackData.msType = GlobalConfig.msType;
... ... @@ -1402,6 +1403,8 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData.isHost = GlobalConfig.isHost;//
joinClassSuccessCallBackData.maxAudioChannels = GlobalConfig.maxAudioChannels;
joinClassSuccessCallBackData.maxVideoChannels = GlobalConfig.maxVideoChannels;
joinClassSuccessCallBackData.maxMediaChannels = GlobalConfig.maxMediaChannels;
joinClassSuccessCallBackData.mcuDelay = GlobalConfig.mcuDelay;
joinClassSuccessCallBackData.msType = GlobalConfig.msType;
... ...
... ... @@ -52,6 +52,7 @@ class GlobalConfig {
classInfo.MCUServerPort=this.MCUServerPort;
classInfo.maxVideoChannels= this.maxVideoChannels;
classInfo.maxAudioChannels=this.maxAudioChannels;
classInfo.maxMediaChannels=this.maxMediaChannels;
classInfo.fps=this.fps;
classInfo.gop=this.gop;
classInfo.videoQuality=this.videoQuality;
... ... @@ -306,8 +307,9 @@ GlobalConfig.DOCServerPort ="";
GlobalConfig.RecordServerIP ="";
GlobalConfig.RecordServerPort ="";
GlobalConfig.maxVideoChannels=0;
GlobalConfig.maxAudioChannels=0;
GlobalConfig.maxVideoChannels=0;//最大视频路数
GlobalConfig.maxAudioChannels=0;//最大音频路数
GlobalConfig.maxMediaChannels=0;//最大音视频路数,以音视频路数中的最大值为准
GlobalConfig.hasCamera=false;//摄像头是否可用
GlobalConfig.hasMicrophone=false;//麦克风是否可用
... ...