正在显示
3 个修改的文件
包含
23 行增加
和
3 行删除
此 diff 太大无法显示。
| @@ -141,7 +141,7 @@ export default class MessageEntrance extends Emiter { | @@ -141,7 +141,7 @@ export default class MessageEntrance extends Emiter { | ||
| 141 | this.getVideoPublishPath = this._getVideoPublishPath.bind(this); | 141 | this.getVideoPublishPath = this._getVideoPublishPath.bind(this); |
| 142 | this.getVideoAllChannelInfo = this._getVideoAllChannelInfo.bind(this); | 142 | this.getVideoAllChannelInfo = this._getVideoAllChannelInfo.bind(this); |
| 143 | this.publishVideo = this._publishVideo.bind(this); | 143 | this.publishVideo = this._publishVideo.bind(this); |
| 144 | - this.stopPublishVideo = this._stopPublishVideo.bind(this); | 144 | + this.stopPublishVideo =this.unPublishVideo= this._stopPublishVideo.bind(this); |
| 145 | this.sendVideoBroadcastMsg = this._sendVideoBroadcastMsg.bind(this); | 145 | this.sendVideoBroadcastMsg = this._sendVideoBroadcastMsg.bind(this); |
| 146 | 146 | ||
| 147 | 147 | ||
| @@ -150,7 +150,7 @@ export default class MessageEntrance extends Emiter { | @@ -150,7 +150,7 @@ export default class MessageEntrance extends Emiter { | ||
| 150 | this.getAudioPublishPath = this._getPublishAudioPath.bind(this); | 150 | this.getAudioPublishPath = this._getPublishAudioPath.bind(this); |
| 151 | this.getAudioAllChannelInfo = this._getAudioAllChannelInfo.bind(this); | 151 | this.getAudioAllChannelInfo = this._getAudioAllChannelInfo.bind(this); |
| 152 | this.publishAudio = this._publishAudio.bind(this); | 152 | this.publishAudio = this._publishAudio.bind(this); |
| 153 | - this.stopPublishAudio = this._stopPublishAudio.bind(this); | 153 | + this.stopPublishAudio =this.unPublishAudio= this._stopPublishAudio.bind(this); |
| 154 | this.sendAudioBroadcastMsg = this.sendAudioCommandMsg.bind(this); | 154 | this.sendAudioBroadcastMsg = this.sendAudioCommandMsg.bind(this); |
| 155 | 155 | ||
| 156 | //whiteBoradApe | 156 | //whiteBoradApe |
| @@ -424,6 +424,11 @@ export default class MessageEntrance extends Emiter { | @@ -424,6 +424,11 @@ export default class MessageEntrance extends Emiter { | ||
| 424 | GlobalConfig.maxVideoChannels = _data.maxVideoChannels; | 424 | GlobalConfig.maxVideoChannels = _data.maxVideoChannels; |
| 425 | GlobalConfig.maxAudioChannels = _data.maxAudioChannels; | 425 | GlobalConfig.maxAudioChannels = _data.maxAudioChannels; |
| 426 | 426 | ||
| 427 | + //视频质量相关设置 | ||
| 428 | + GlobalConfig.fps = _data.fps||15; | ||
| 429 | + GlobalConfig.gop = _data.gop||3;; | ||
| 430 | + GlobalConfig.videoQuality = _data.videoQuality||2; | ||
| 431 | + | ||
| 427 | GlobalConfig.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表 | 432 | GlobalConfig.setDocListPrepare(_data.docListPrepare); //提前上传的文档列表 |
| 428 | GlobalConfig.setRecordList(_data.recordList);//录制回放地址 | 433 | GlobalConfig.setRecordList(_data.recordList);//录制回放地址 |
| 429 | GlobalConfig.setDocList(_data.docList);//文档地址 | 434 | GlobalConfig.setDocList(_data.docList);//文档地址 |
| @@ -595,6 +600,11 @@ export default class MessageEntrance extends Emiter { | @@ -595,6 +600,11 @@ export default class MessageEntrance extends Emiter { | ||
| 595 | 600 | ||
| 596 | joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 | 601 | joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 |
| 597 | joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 | 602 | joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 |
| 603 | + | ||
| 604 | + joinClassSuccessCallBackData.fps=GlobalConfig.fps; | ||
| 605 | + joinClassSuccessCallBackData.gop=GlobalConfig.gop; | ||
| 606 | + joinClassSuccessCallBackData.videoQuality=GlobalConfig.videoQuality; | ||
| 607 | + | ||
| 598 | loger.log('加入课堂成功'); | 608 | loger.log('加入课堂成功'); |
| 599 | loger.log(joinClassSuccessCallBackData); | 609 | loger.log(joinClassSuccessCallBackData); |
| 600 | 610 | ||
| @@ -1144,6 +1154,10 @@ export default class MessageEntrance extends Emiter { | @@ -1144,6 +1154,10 @@ export default class MessageEntrance extends Emiter { | ||
| 1144 | joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 | 1154 | joinClassSuccessCallBackData.classTimestamp=GlobalConfig.classTimestamp;//课堂进行的累积时间 |
| 1145 | joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 | 1155 | joinClassSuccessCallBackData.recordPlaybackMaxTime=GlobalConfig.recordPlaybackMaxTime;//录制回放的总时间 |
| 1146 | 1156 | ||
| 1157 | + joinClassSuccessCallBackData.fps=GlobalConfig.fps; | ||
| 1158 | + joinClassSuccessCallBackData.gop=GlobalConfig.gop; | ||
| 1159 | + joinClassSuccessCallBackData.videoQuality=GlobalConfig.videoQuality; | ||
| 1160 | + | ||
| 1147 | loger.log(joinClassSuccessCallBackData); | 1161 | loger.log(joinClassSuccessCallBackData); |
| 1148 | //和加入课堂成功使用同样的消息处理 | 1162 | //和加入课堂成功使用同样的消息处理 |
| 1149 | this._emit(MessageTypes.CLASS_JOIN_SUCCESS, joinClassSuccessCallBackData); | 1163 | this._emit(MessageTypes.CLASS_JOIN_SUCCESS, joinClassSuccessCallBackData); |
| @@ -52,6 +52,9 @@ class GlobalConfig { | @@ -52,6 +52,9 @@ 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.fps=this.fps; | ||
| 56 | + classInfo.gop=this.gop; | ||
| 57 | + classInfo.videoQuality=this.videoQuality; | ||
| 55 | 58 | ||
| 56 | return classInfo; | 59 | return classInfo; |
| 57 | 60 | ||
| @@ -314,7 +317,10 @@ GlobalConfig.updateClassInfoDelay=30;//(秒),每隔30秒同步一次课堂状 | @@ -314,7 +317,10 @@ GlobalConfig.updateClassInfoDelay=30;//(秒),每隔30秒同步一次课堂状 | ||
| 314 | GlobalConfig.activeDocId=0;//当前激活的文档ID | 317 | GlobalConfig.activeDocId=0;//当前激活的文档ID |
| 315 | GlobalConfig.activeDocCurPage=1;//当前激活的文档的当前页 | 318 | GlobalConfig.activeDocCurPage=1;//当前激活的文档的当前页 |
| 316 | 319 | ||
| 317 | - | 320 | +//视频质量相关设置 |
| 321 | +GlobalConfig.fps=15;//帧频 | ||
| 322 | +GlobalConfig.gop=3;//关键帧间隔(秒) | ||
| 323 | +GlobalConfig.videoQuality=2;//画面质量 0-低;1-中;2-高; | ||
| 318 | 324 | ||
| 319 | 325 | ||
| 320 | GlobalConfig.classAllParam={};//Sass直接返回的所有课堂信息(最全) | 326 | GlobalConfig.classAllParam={};//Sass直接返回的所有课堂信息(最全) |
-
请 注册 或 登录 后发表评论