Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

与master分支同步

Browse Source
This commit is contained in:
Lawrence 2021-01-12 13:50:04 +08:00
parent 2cb73e94c5
commit c00d51060c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -409,12 +409,7 @@ public class SIPCommander implements ISIPCommander {
try { try {
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String ssrc = streamSession.createPlayBackSsrc(); String ssrc = streamSession.createPlayBackSsrc();
String streamId = null; String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
if (rtpEnable) {
streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
}else {
streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
}
// 添加订阅 // 添加订阅
JSONObject subscribeKey = new JSONObject(); JSONObject subscribeKey = new JSONObject();
subscribeKey.put("app", "rtp"); subscribeKey.put("app", "rtp");

8
web_src/src/components/gb28181/devicePlayer.vue
View File

@ -183,7 +183,8 @@ export default {
scanGroup: 0, scanGroup: 0,
tracks: [], tracks: [],
coverPlaying:false, coverPlaying:false,
tracksLoading: false tracksLoading: false,
recordPlay: ""
}; };
}, },
methods: { methods: {
@ -318,6 +319,10 @@ export default {
this.convertStop(); this.convertStop();
} }
this.convertKey = '' this.convertKey = ''
if (this.recordPlay != '') {
this.stopPlayRecord();
}
this.recordPlay = ''
}, },
copySharedInfo: function (data) { copySharedInfo: function (data) {
@ -384,6 +389,7 @@ export default {
var streamInfo = res.data; var streamInfo = res.data;
that.streamId = streamInfo.streamId; that.streamId = streamInfo.streamId;
that.videoUrl = streamInfo.ws_flv; that.videoUrl = streamInfo.ws_flv;
that.recordPlay = true;
}); });
} }
}, },