Merge remote-tracking branch 'origin/master'

This commit is contained in:
shikong 2024-03-18 08:39:10 +08:00
commit 33185bdc1f

View File

@ -168,7 +168,7 @@ public class Gb28181DownloadService {
openRtpServer.setStreamId(streamId); openRtpServer.setStreamId(streamId);
openRtpServer.setTcpMode(streamMode); openRtpServer.setTcpMode(streamMode);
OpenRtpServerResp openRtpServerResp = zlmMediaService.openRtpServer(openRtpServer); OpenRtpServerResp openRtpServerResp = zlmMediaService.openRtpServer(openRtpServer);
log.info("openRtpServerResp => {}", openRtpServerResp); log.info("openRtpServerResp => {} => {}", streamId, openRtpServerResp);
if (!openRtpServerResp.getCode().equals(ResponseStatus.Success)) { if (!openRtpServerResp.getCode().equals(ResponseStatus.Success)) {
log.error("{}", openRtpServerResp.getCode().getMsg()); log.error("{}", openRtpServerResp.getCode().getMsg());
return -1; return -1;
@ -537,7 +537,6 @@ public class Gb28181DownloadService {
result.complete(null); result.complete(null);
return result; return result;
} }
String ssrc = ssrcService.getPlaySsrc(); String ssrc = ssrcService.getPlaySsrc();
TimeField timeField = new TimeField(); TimeField timeField = new TimeField();
timeField.setStartTime(start); timeField.setStartTime(start);