From 39a1a84961f345d9b2b1f05397f5c3dd98d5807d Mon Sep 17 00:00:00 2001 From: zxb <919411476@qq.com> Date: Thu, 14 Mar 2024 03:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=8E=A8=E6=B5=81?= =?UTF-8?q?=E9=89=B4=E6=9D=83=E4=BA=8B=E4=BB=B6=E8=AE=A2=E9=98=85=20+=20ac?= =?UTF-8?q?k=20=E4=BA=8B=E4=BB=B6=E5=85=B3=E8=81=94=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/request/impl/AckRequestProcessor.java | 12 +++++++----- .../genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java index 6387e975..cbd2f3a1 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java @@ -143,11 +143,6 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In // } // }); - SipSubscribe.Event platformAckSubscribe = sipSubscribe.getOkSubscribe("ACK_" + callIdHeader.getCallId()); - if(platformAckSubscribe != null) { - platformAckSubscribe.response(null); - } - // SipSubscribe.Event okSubscribe = sipSubscribe.getOkSubscribe("ACK_" + platformGbId + "_" + callIdHeader.getCallId()); // if( okSubscribe != null) { // okSubscribe.response(new SipSubscribe.EventResult<>(evt)); @@ -181,6 +176,13 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In // return; // } + scheduledExecutorService.schedule(()->{ + SipSubscribe.Event platformAckSubscribe = sipSubscribe.getOkSubscribe("ACK_" + callIdHeader.getCallId()); + if(platformAckSubscribe != null) { + platformAckSubscribe.response(null); + } + }, 100, TimeUnit.MILLISECONDS); + String is_Udp = sendRtpItem.isTcp() ? "0" : "1"; MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId()); logger.info("收到ACK，rtp/{}开始向上级推流, 目标={}:{}，SSRC={}, 协议:{}", diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java index d3c86336..8f54f668 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java @@ -48,7 +48,7 @@ public class ZLMRESTfulUtils { httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES)); if (logger.isDebugEnabled()) { HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> { - logger.debug("http请求参数：" + message); + // logger.debug("http请求参数：" + message); }); logging.setLevel(HttpLoggingInterceptor.Level.BASIC); // OkHttp進行添加攔截器loggingInterceptor