修复合并的bug
parent
6c9d6f0054
commit
38a85d432a
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue