From fc90cd7951600ce5173f71c3e28d78e69b4db4ae Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 19 十二月 2022 14:20:22 +0800
Subject: [PATCH] 优化tcp主动方式的语音对讲
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index 33c02ad..696fae0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -2,8 +2,11 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -21,11 +24,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.web.context.request.async.DeferredResult;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
/**
* @author lin
@@ -40,6 +46,9 @@
@Autowired
private SIPCommander cmder;
+
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
private IVideoManagerStorage storager;
@@ -92,7 +101,15 @@
if (ObjectUtils.isEmpty(deviceId) || ObjectUtils.isEmpty(channelId) || ObjectUtils.isEmpty(stream)) {
throw new ControllerException(ErrorCode.ERROR400);
}
- cmder.streamByeCmd(deviceId, channelId, stream, null);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璁惧锛�" + deviceId + " 鏈壘鍒�");
+ }
+ try {
+ cmder.streamByeCmd(device, channelId, stream, null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍙戦�乥ye澶辫触锛� " + e.getMessage());
+ }
}
@@ -101,13 +118,14 @@
@GetMapping("/pause/{streamId}")
public void playPause(@PathVariable String streamId) {
logger.info("playPause: "+streamId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- logger.warn("streamId涓嶅瓨鍦�!");
- throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
+
+ try {
+ playService.pauseRtp(streamId);
+ } catch (ServiceException e) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), e.getMessage());
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playPauseCmd(device, streamInfo);
}
@@ -116,13 +134,13 @@
@GetMapping("/resume/{streamId}")
public void playResume(@PathVariable String streamId) {
logger.info("playResume: "+streamId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- logger.warn("streamId涓嶅瓨鍦�!");
- throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
+ try {
+ playService.resumeRtp(streamId);
+ } catch (ServiceException e) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), e.getMessage());
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playResumeCmd(device, streamInfo);
}
@@ -138,7 +156,11 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playSeekCmd(device, streamInfo, seekTime);
+ try {
+ cmder.playSeekCmd(device, streamInfo, seekTime);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
@Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�")
@@ -157,6 +179,10 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "涓嶆敮鎸佺殑speed锛�0.25 0.5 1銆�2銆�4锛�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playSpeedCmd(device, streamInfo, speed);
+ try {
+ cmder.playSpeedCmd(device, streamInfo, speed);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
}
--
Gitblit v1.8.0