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-03-17 14:49:24 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
617ffa2e631c379e6845abc09d7df45b70bd61cb
617ffa2e
1 parent
90d2ba02
1.视频模块增加 FPS\GEO ,videoQuality设置
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
23 行增加
和
3 行删除
dist/McuClient.js
src/EngineEntrance.js
src/GlobalConfig.js
dist/McuClient.js
查看文件 @
617ffa2
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
617ffa2
...
...
@@ -141,7 +141,7 @@ export default class MessageEntrance extends Emiter {
this
.
getVideoPublishPath
=
this
.
_getVideoPublishPath
.
bind
(
this
);
this
.
getVideoAllChannelInfo
=
this
.
_getVideoAllChannelInfo
.
bind
(
this
);
this
.
publishVideo
=
this
.
_publishVideo
.
bind
(
this
);
this
.
stopPublishVideo
=
this
.
_stopPublishVideo
.
bind
(
this
);
this
.
stopPublishVideo
=
this
.
unPublishVideo
=
this
.
_stopPublishVideo
.
bind
(
this
);
this
.
sendVideoBroadcastMsg
=
this
.
_sendVideoBroadcastMsg
.
bind
(
this
);
...
...
@@ -150,7 +150,7 @@ export default class MessageEntrance extends Emiter {
this
.
getAudioPublishPath
=
this
.
_getPublishAudioPath
.
bind
(
this
);
this
.
getAudioAllChannelInfo
=
this
.
_getAudioAllChannelInfo
.
bind
(
this
);
this
.
publishAudio
=
this
.
_publishAudio
.
bind
(
this
);
this
.
stopPublishAudio
=
this
.
_stopPublishAudio
.
bind
(
this
);
this
.
stopPublishAudio
=
this
.
unPublishAudio
=
this
.
_stopPublishAudio
.
bind
(
this
);
this
.
sendAudioBroadcastMsg
=
this
.
sendAudioCommandMsg
.
bind
(
this
);
//whiteBoradApe
...
...
@@ -424,6 +424,11 @@ export default class MessageEntrance extends Emiter {
GlobalConfig
.
maxVideoChannels
=
_data
.
maxVideoChannels
;
GlobalConfig
.
maxAudioChannels
=
_data
.
maxAudioChannels
;
//视频质量相关设置
GlobalConfig
.
fps
=
_data
.
fps
||
15
;
GlobalConfig
.
gop
=
_data
.
gop
||
3
;;
GlobalConfig
.
videoQuality
=
_data
.
videoQuality
||
2
;
GlobalConfig
.
setDocListPrepare
(
_data
.
docListPrepare
);
//提前上传的文档列表
GlobalConfig
.
setRecordList
(
_data
.
recordList
);
//录制回放地址
GlobalConfig
.
setDocList
(
_data
.
docList
);
//文档地址
...
...
@@ -595,6 +600,11 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData
.
classTimestamp
=
GlobalConfig
.
classTimestamp
;
//课堂进行的累积时间
joinClassSuccessCallBackData
.
recordPlaybackMaxTime
=
GlobalConfig
.
recordPlaybackMaxTime
;
//录制回放的总时间
joinClassSuccessCallBackData
.
fps
=
GlobalConfig
.
fps
;
joinClassSuccessCallBackData
.
gop
=
GlobalConfig
.
gop
;
joinClassSuccessCallBackData
.
videoQuality
=
GlobalConfig
.
videoQuality
;
loger
.
log
(
'加入课堂成功'
);
loger
.
log
(
joinClassSuccessCallBackData
);
...
...
@@ -1144,6 +1154,10 @@ export default class MessageEntrance extends Emiter {
joinClassSuccessCallBackData
.
classTimestamp
=
GlobalConfig
.
classTimestamp
;
//课堂进行的累积时间
joinClassSuccessCallBackData
.
recordPlaybackMaxTime
=
GlobalConfig
.
recordPlaybackMaxTime
;
//录制回放的总时间
joinClassSuccessCallBackData
.
fps
=
GlobalConfig
.
fps
;
joinClassSuccessCallBackData
.
gop
=
GlobalConfig
.
gop
;
joinClassSuccessCallBackData
.
videoQuality
=
GlobalConfig
.
videoQuality
;
loger
.
log
(
joinClassSuccessCallBackData
);
//和加入课堂成功使用同样的消息处理
this
.
_emit
(
MessageTypes
.
CLASS_JOIN_SUCCESS
,
joinClassSuccessCallBackData
);
...
...
src/GlobalConfig.js
查看文件 @
617ffa2
...
...
@@ -52,6 +52,9 @@ class GlobalConfig {
classInfo
.
MCUServerPort
=
this
.
MCUServerPort
;
classInfo
.
maxVideoChannels
=
this
.
maxVideoChannels
;
classInfo
.
maxAudioChannels
=
this
.
maxAudioChannels
;
classInfo
.
fps
=
this
.
fps
;
classInfo
.
gop
=
this
.
gop
;
classInfo
.
videoQuality
=
this
.
videoQuality
;
return
classInfo
;
...
...
@@ -314,7 +317,10 @@ GlobalConfig.updateClassInfoDelay=30;//(秒),每隔30秒同步一次课堂状
GlobalConfig
.
activeDocId
=
0
;
//当前激活的文档ID
GlobalConfig
.
activeDocCurPage
=
1
;
//当前激活的文档的当前页
//视频质量相关设置
GlobalConfig
.
fps
=
15
;
//帧频
GlobalConfig
.
gop
=
3
;
//关键帧间隔(秒)
GlobalConfig
.
videoQuality
=
2
;
//画面质量 0-低;1-中;2-高;
GlobalConfig
.
classAllParam
=
{};
//Sass直接返回的所有课堂信息(最全)
...
...
请
注册
或
登录
后发表评论