Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
2017-05-04 19:21:58 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cd856b415966bc9d51ba112ab63ac1b1e6071694
cd856b41
1 parent
7bce6a82
增加最多可以显示音视频数量字段 maxMediaChannels;这个值就是最多现实音视频视图窗口的数量
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
4 行删除
src/EngineEntrance.js
src/GlobalConfig.js
src/EngineEntrance.js
查看文件 @
cd856b4
...
...
@@ -27,7 +27,7 @@ import Server from "config/Server";
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.1
1.3
.20170504"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.1
2.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
;
...
...
src/GlobalConfig.js
查看文件 @
cd856b4
...
...
@@ -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
;
//麦克风是否可用
...
...
请
注册
或
登录
后发表评论