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

DeviceProxyService 调整

Browse Source
This commit is contained in:
shikong 2024-03-14 10:53:57 +08:00
parent 28dfe97a5a
commit 39af43f7aa
1 changed files with 82 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,9 +198,12 @@ public class DeviceProxyService {
public TaskProcessor playbackTask(){ public TaskProcessor playbackTask(){
return (Runnable sendOkResponse, SIPRequest request,String callId,String fromUrl, String toAddr,int toPort, MockingDevice device, String key, long time,String ssrc) -> { return (Runnable sendOkResponse, SIPRequest request,String callId,String fromUrl, String toAddr,int toPort, MockingDevice device, String key, long time,String ssrc) -> {
scheduledExecutorService.schedule(() -> { try {
trying(request); TimeUnit.SECONDS.sleep(1);
sendOkResponse.run(); } catch (InterruptedException e) {
log.error("{}", e.getMessage());
}
String ackKey = GenericSubscribe.Helper.getKey(Request.ACK, callId); String ackKey = GenericSubscribe.Helper.getKey(Request.ACK, callId);
subscribe.getAckSubscribe().addPublisher(ackKey, 1, TimeUnit.MINUTES); subscribe.getAckSubscribe().addPublisher(ackKey, 1, TimeUnit.MINUTES);
subscribe.getAckSubscribe().addSubscribe(ackKey, new Flow.Subscriber<>() { subscribe.getAckSubscribe().addSubscribe(ackKey, new Flow.Subscriber<>() {
@ -230,12 +233,13 @@ public class DeviceProxyService {
callbackTask.put(device.getDeviceCode(), executor); callbackTask.put(device.getDeviceCode(), executor);
executeResultHandler.waitFor(); executeResultHandler.waitFor();
} catch (Exception e) { } catch (Exception e) {
sendBye(request,device,""); sendBye(request, device, "");
log.error("{}", e.getMessage()); log.error("{}", e.getMessage());
} }
} }
}); });
}, 1, TimeUnit.SECONDS); trying(request);
sendOkResponse.run();
}; };
} }
@ -247,8 +251,6 @@ public class DeviceProxyService {
log.error("{}", e.getMessage()); log.error("{}", e.getMessage());
} }
trying(request);
sendOkResponse.run();
String ackKey = GenericSubscribe.Helper.getKey(Request.ACK, callId); String ackKey = GenericSubscribe.Helper.getKey(Request.ACK, callId);
subscribe.getAckSubscribe().addPublisher(ackKey, 1, TimeUnit.MINUTES); subscribe.getAckSubscribe().addPublisher(ackKey, 1, TimeUnit.MINUTES);
subscribe.getAckSubscribe().addSubscribe(ackKey, new Flow.Subscriber<>() { subscribe.getAckSubscribe().addSubscribe(ackKey, new Flow.Subscriber<>() {
@ -271,9 +273,9 @@ public class DeviceProxyService {
Flow.Subscriber<SIPRequest> task = ffmpegTask(request, downloadTask, callId, key, device); Flow.Subscriber<SIPRequest> task = ffmpegTask(request, downloadTask, callId, key, device);
try { try {
FfmpegExecuteResultHandler executeResultHandler = mediaStatus(request, device, key); FfmpegExecuteResultHandler executeResultHandler = mediaStatus(request, device, key);
if(!ffmpegConfig.getRtp().getUseRtpToDownload()){ if (!ffmpegConfig.getRtp().getUseRtpToDownload()) {
String zlmRtpUrl = getZlmRtmpUrl(DEFAULT_ZLM_APP, callId); String zlmRtpUrl = getZlmRtmpUrl(DEFAULT_ZLM_APP, callId);
scheduledExecutorService.submit(()->{ scheduledExecutorService.submit(() -> {
try { try {
requestZlmPushStream(request, callId, fromUrl, toAddr, toPort, device, key, time, ssrc); requestZlmPushStream(request, callId, fromUrl, toAddr, toPort, device, key, time, ssrc);
} catch (Exception e) { } catch (Exception e) {
@ -297,7 +299,8 @@ public class DeviceProxyService {
} }
} }
}); });
trying(request);
sendOkResponse.run();
}; };
} }