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

断流后自动清除Redis中的播放条目

Browse Source
This commit is contained in:
Lawrence 2020-10-29 10:20:06 +08:00
parent edc16ec434
commit eecffb5116
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -142,7 +142,7 @@ public class ZLMHttpHookListener {
storager.startPlay(streamInfoForPlay);
}
StreamInfo streamInfoForPlayBack = storager.queryPlayBlackBySSRC(ssrc);
StreamInfo streamInfoForPlayBack = storager.queryPlaybackBySSRC(ssrc);
if ("rtp".equals(app) && streamInfoForPlayBack != null ) {
MediaServerConfig mediaInfo = storager.getMediaInfo();
streamInfoForPlayBack.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
@ -150,7 +150,7 @@ public class ZLMHttpHookListener {
streamInfoForPlayBack.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtmpPort(), streamId));
streamInfoForPlayBack.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
streamInfoForPlayBack.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtspPort(), streamId));
storager.startPlayBlack(streamInfoForPlayBack);
storager.startPlayback(streamInfoForPlayBack);
}
// TODO Auto-generated method stub
@ -261,7 +261,12 @@ public class ZLMHttpHookListener {
String ssrc = new DecimalFormat("0000000000").format(Integer.parseInt(streamId, 16));
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
if ("rtp".equals(app) && !regist ) {
storager.stopPlay(streamInfo);
if (streamInfo!=null){
storager.stopPlay(streamInfo);
}else{
streamInfo = storager.queryPlaybackBySSRC(ssrc);
storager.stopPlayback(streamInfo);
}
}
@ -288,6 +293,13 @@ public class ZLMHttpHookListener {
String ssrc = String.format("%010d", numb);
cmder.streamByeCmd(ssrc);
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
if (streamInfo!=null){
storager.stopPlay(streamInfo);
}else{
streamInfo = storager.queryPlaybackBySSRC(ssrc);
storager.stopPlayback(streamInfo);
}
JSONObject ret = new JSONObject();
ret.put("code", 0);