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
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d53faee01d1f52da45483b845e58ea08e32f4ed1
d53faee0
1 parent
34f49714
1.修改监课推流获取频道的规则,先查找空闲的频道
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
14 行增加
和
5 行删除
src/EngineEntrance.js
src/apes/MediaModule.js
src/EngineEntrance.js
查看文件 @
d53faee
...
...
@@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
constructor
()
{
super
();
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v1.
79.6.20170822
"
;
GlobalConfig
.
sdkVersion
=
"v1.
80.1.20170823
"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//设置
...
...
src/apes/MediaModule.js
查看文件 @
d53faee
...
...
@@ -141,14 +141,23 @@ class MediaModule {
//监课获取推流地址
getMediaPublishPathForInVisible
(
_param
)
{
let
mediaLen
=
Object
.
keys
(
MediaModule
.
allMediaChannelsList
).
length
;
let
freeChannel
=
(
this
.
MEDIA_OBJ_TABLE_ID
-
20
-
mediaLen
)
||
GlobalConfig
.
nodeId
;
let
freeChannel
=
0
;
//先从现有的空闲列表中获取频道号
for
(
let
i
in
MediaModule
.
allMediaChannelsList
){
let
channelItem
=
MediaModule
.
allMediaChannelsList
[
i
];
if
(
channelItem
&&
channelItem
.
status
==
ApeConsts
.
CHANNEL_STATUS_RELEASED
&&
channelItem
.
userRole
==
ApeConsts
.
invisible
){
freeChannel
=
channelItem
.
channelId
;
break
;
}
}
//如果没有取到空闲的,就创建一个新的频道
freeChannel
=
freeChannel
||
(
this
.
MEDIA_OBJ_TABLE_ID
-
20
-
mediaLen
);
loger
.
log
(
'监课获取推流地址->'
+
freeChannel
+
" mediaLen:"
+
mediaLen
);
//默认方式推流
let
pubType
=
"live"
;
////flash推流
//if(_param&&_param.type=="flash"){
// pubType ="flash";
//}
//端口,有端口就显示 ":xxx",没有端口就是""
let
port
=
(
GlobalConfig
.
MS_PUBLISH_PORT
==
""
||
GlobalConfig
.
MS_PUBLISH_PORT
==
null
)
?
""
:
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
...
...
请
注册
或
登录
后发表评论