From d46fc9de827fe85a48f447cf1550444573a6f1a5 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 14 四月 2023 14:59:22 +0800 Subject: [PATCH] 优化下级平台自定义ssrc的情况,优化国标录像下载流程 --- src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java index dd08101..a5b9034 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java @@ -1,15 +1,13 @@ package com.genersoft.iot.vmp.service; -import com.alibaba.fastjson.JSONObject; -import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.common.CommonCallback; import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData; import com.genersoft.iot.vmp.service.bean.MediaServerLoad; import com.genersoft.iot.vmp.service.bean.SSRCInfo; -import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import java.util.List; -import java.util.Map; /** * 濯掍綋鏈嶅姟鑺傜偣 @@ -40,7 +38,7 @@ */ void zlmServerOffline(String mediaServerId); - MediaServerItem getMediaServerForMinimumLoad(); + MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist); void setZLMConfig(MediaServerItem mediaServerItem, boolean restart); @@ -53,6 +51,8 @@ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port); void closeRTPServer(MediaServerItem mediaServerItem, String streamId); + + void closeRTPServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback); void closeRTPServer(String mediaServerId, String streamId); @@ -86,7 +86,7 @@ MediaServerItem getDefaultMediaServer(); - void updateMediaServerKeepalive(String mediaServerId, JSONObject data); + void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data); boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream); -- Gitblit v1.8.0