roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复合并的bug

Browse Source
This commit is contained in:
648540858
2022-11-29 17:51:45 +08:00
parent 6c9d6f0054
commit 38a85d432a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
View File

@@ -236,8 +236,8 @@ public class StreamInfo implements Serializable, Cloneable{
} }
} }
public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) { public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam, boolean isPlay) {
String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam); String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s%s", app, stream, isPlay?"play":"push", callIdParam);
if (port > 0) { if (port > 0) {
this.rtc = new StreamURL("http", host, port, file); this.rtc = new StreamURL("http", host, port, file);
} }

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
View File

@@ -127,8 +127,6 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements
} }
}catch (Exception e) { }catch (Exception e) {
logger.error("处理NOTIFY消息时错误", e); logger.error("处理NOTIFY消息时错误", e);
}finally {
taskQueueHandlerRun = false;
} }
}); });
} }