Shikong/gb28181-docking-platform-mocking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整 on_stream_none_reader 仅对 rtmp 做处理

Browse Source
This commit is contained in:
shikong 2024-03-13 10:13:37 +08:00
parent 8fefeb2187
commit ff6a5484e3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gb28181-mocking-api/src/main/java/cn/skcks/docking/gb28181/mocking/api/zlm/ZlmHookApi.java
View File

@ -32,15 +32,17 @@ public class ZlmHookApi {
@PostJson("/on_stream_changed") @PostJson("/on_stream_changed")
public void onStreamChanged(@RequestBody ZlmStreamChangeDTO dto){ public void onStreamChanged(@RequestBody ZlmStreamChangeDTO dto){
log.debug("on_stream_changed {}", dto); log.debug("on_stream_changed {}", dto);
if(StringUtils.equalsIgnoreCase(dto.getSchema(), "rtsp")){ if(StringUtils.equalsIgnoreCase(dto.getSchema(), "rtmp")){
zlmStreamChangeHookService.processEvent(dto.getApp(),dto.getStream(), dto.getRegist()); zlmStreamChangeHookService.processEvent(dto.getApp(),dto.getStream(), dto.getRegist());
} }
} }
@PostJson("/on_stream_none_reader") @PostJson("/on_stream_none_reader")
public void onStreamNoneReader(@RequestBody ZlmStreamNoneReaderDTO dto){ public void onStreamNoneReader(@RequestBody ZlmStreamNoneReaderDTO dto){
if(StringUtils.equalsIgnoreCase(dto.getSchema(), "rtmp")){
zlmStreamNoneReaderHookService.processEvent(dto.getApp(),dto.getStream()); zlmStreamNoneReaderHookService.processEvent(dto.getApp(),dto.getStream());
} }
}
@SneakyThrows @SneakyThrows
@PostJson("/on_publish") @PostJson("/on_publish")

2
gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/service/device/DeviceProxyService.java
View File

@ -428,7 +428,7 @@ public class DeviceProxyService {
.withStopStrategy(StopStrategies.stopAfterAttempt(3)) .withStopStrategy(StopStrategies.stopAfterAttempt(3))
.build(); .build();
String toUrl = "rtsp://" + zlmMediaConfig.getIp() + ":" + zlmRtmpConfig.getPort() + "/" + ZLM_FFMPEG_PROXY_APP +"/" + callId; String toUrl = "rtmp://" + zlmMediaConfig.getIp() + ":" + zlmRtmpConfig.getPort() + "/" + ZLM_FFMPEG_PROXY_APP +"/" + callId;
String key = GenericSubscribe.Helper.getKey(Request.BYE, callId); String key = GenericSubscribe.Helper.getKey(Request.BYE, callId);
try { try {
ZlmResponse<AddFFmpegSourceResp> sourceResp = retryer.call(() -> zlmMediaService.addFfmpegSource(AddFFmpegSource.builder() ZlmResponse<AddFFmpegSourceResp> sourceResp = retryer.call(() -> zlmMediaService.addFfmpegSource(AddFFmpegSource.builder()