From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 11:40:17 +0800
Subject: [PATCH] 修复未结束的推流无法下载
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 5a573f7..f3d542c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.transmit.ISIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.SipStackImpl;
@@ -28,27 +29,11 @@
private SipConfig sipConfig;
@Autowired
- private SIPProcessorObserver sipProcessorObserver;
-
- @Autowired
- private SipSubscribe sipSubscribe;
+ private ISIPProcessorObserver sipProcessorObserver;
private SipStackImpl sipStack;
private SipFactory sipFactory;
-
- /**
- * 娑堟伅澶勭悊鍣ㄧ嚎绋嬫睜
- */
- private ThreadPoolExecutor processThreadPool;
-
- public SipLayer() {
- int processThreadNum = Runtime.getRuntime().availableProcessors() * 10;
- LinkedBlockingQueue<Runnable> processQueue = new LinkedBlockingQueue<>(10000);
- processThreadPool = new ThreadPoolExecutor(processThreadNum,processThreadNum,
- 0L,TimeUnit.MILLISECONDS,processQueue,
- new ThreadPoolExecutor.CallerRunsPolicy());
- }
@Bean("sipFactory")
@@ -77,7 +62,7 @@
return sipStack;
}
- @Bean("tcpSipProvider")
+ @Bean(name = "tcpSipProvider")
@DependsOn("sipStack")
private SipProviderImpl startTcpListener() {
ListeningPoint tcpListeningPoint = null;
@@ -85,6 +70,7 @@
try {
tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
+ tcpSipProvider.setDialogErrorsAutomaticallyHandled();
tcpSipProvider.addSipListener(sipProcessorObserver);
logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");
} catch (TransportNotSupportedException e) {
@@ -100,7 +86,7 @@
return tcpSipProvider;
}
- @Bean("udpSipProvider")
+ @Bean(name = "udpSipProvider")
@DependsOn("sipStack")
private SipProviderImpl startUdpListener() {
ListeningPoint udpListeningPoint = null;
--
Gitblit v1.8.0