Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
33185bdc1f
@ -168,7 +168,7 @@ public class Gb28181DownloadService {
|
||||
openRtpServer.setStreamId(streamId);
|
||||
openRtpServer.setTcpMode(streamMode);
|
||||
OpenRtpServerResp openRtpServerResp = zlmMediaService.openRtpServer(openRtpServer);
|
||||
log.info("openRtpServerResp => {}", openRtpServerResp);
|
||||
log.info("openRtpServerResp => {} => {}", streamId, openRtpServerResp);
|
||||
if (!openRtpServerResp.getCode().equals(ResponseStatus.Success)) {
|
||||
log.error("{}", openRtpServerResp.getCode().getMsg());
|
||||
return -1;
|
||||
@ -537,7 +537,6 @@ public class Gb28181DownloadService {
|
||||
result.complete(null);
|
||||
return result;
|
||||
}
|
||||
|
||||
String ssrc = ssrcService.getPlaySsrc();
|
||||
TimeField timeField = new TimeField();
|
||||
timeField.setStartTime(start);
|
||||
|
Loading…
Reference in New Issue
Block a user