From 6f577268ee570c9e818dcae37628d18f3a7bdbd7 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Fri, 15 Aug 2025 09:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88=E6=9C=ACzl?= =?UTF-8?q?m=E9=99=90=E6=B5=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media/zlm/ZLMMediaNodeServerService.java | 4 ++- .../vmp/service/bean/DownloadFileInfo.java | 34 ++----------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java index fe55bd592..7ce61e20e 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java @@ -375,6 +375,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0"); param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1"); param.put("recv_stream_id", sendRtpItem.getReceiveStream()); + param.put("enable_origin_recv_limit", "1"); if (timeout != null) { param.put("close_delay_ms", timeout); } @@ -410,6 +411,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0"); param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0"); param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1"); + param.put("enable_origin_recv_limit", "1"); if (!sendRtpItem.isTcp()) { // udp模式下开启rtcp保活 param.put("udp_rtcp_timeout", sendRtpItem.isRtcp() ? "500" : "0"); @@ -436,7 +438,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { param.put("type", sendRtpItem.isUsePs() ? "1" : "0"); param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0"); param.put("recv_stream_id", sendRtpItem.getReceiveStream()); - + param.put("enable_origin_recv_limit", "1"); JSONObject jsonObject = zlmServerFactory.startSendRtpTalk(mediaServer, param, null); if (jsonObject == null || jsonObject.getInteger("code") != 0 ) { log.error("启动监听TCP被动推流失败: {}, 参数:{}", jsonObject.getString("msg"), JSON.toJSONString(param)); diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/DownloadFileInfo.java b/src/main/java/com/genersoft/iot/vmp/service/bean/DownloadFileInfo.java index 602e18467..c8e7b158d 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/bean/DownloadFileInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/service/bean/DownloadFileInfo.java @@ -1,5 +1,8 @@ package com.genersoft.iot.vmp.service.bean; +import lombok.Data; + +@Data public class DownloadFileInfo { private String httpPath; @@ -7,35 +10,4 @@ public class DownloadFileInfo { private String httpDomainPath; private String httpsDomainPath; - public String getHttpPath() { - return httpPath; - } - - public void setHttpPath(String httpPath) { - this.httpPath = httpPath; - } - - public String getHttpsPath() { - return httpsPath; - } - - public void setHttpsPath(String httpsPath) { - this.httpsPath = httpsPath; - } - - public String getHttpDomainPath() { - return httpDomainPath; - } - - public void setHttpDomainPath(String httpDomainPath) { - this.httpDomainPath = httpDomainPath; - } - - public String getHttpsDomainPath() { - return httpsDomainPath; - } - - public void setHttpsDomainPath(String httpsDomainPath) { - this.httpsDomainPath = httpsDomainPath; - } }