From 06bbe3fe01e5af9486c309693a975077df813f7c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 29 九月 2022 16:27:59 +0800
Subject: [PATCH] 添加第二种语音对讲实现
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 77 +++++++++++++-------------------------
1 files changed, 27 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 2fcc9c2..bcd8bf1 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -37,6 +38,9 @@
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;
import java.util.List;
import java.util.UUID;
@@ -107,12 +111,23 @@
throw new ControllerException(ErrorCode.ERROR400);
}
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧[" + deviceId + "]涓嶅瓨鍦�");
+ }
+
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐐规挱鏈壘鍒�");
}
- cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, null);
+ try {
+ logger.warn("[鍋滄鐐规挱] {}/{}", device.getDeviceId(), channelId);
+ cmder.streamByeCmd(device, channelId, streamInfo.getStream(), null, null);
+ } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
@@ -201,63 +216,20 @@
@Parameter(name = "timeout", description = "鎺ㄦ祦瓒呮椂鏃堕棿(绉�)", required = true)
@GetMapping("/broadcast/{deviceId}/{channelId}")
@PostMapping("/broadcast/{deviceId}/{channelId}")
- public DeferredResult<WVPResult<AudioBroadcastResult>> broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
+ public AudioBroadcastResult broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
- WVPResult<AudioBroadcastResult> result = new WVPResult<>();
- result.setCode(-1);
- result.setMsg("鏈壘鍒拌澶囷細 " + deviceId);
- DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
- deferredResult.setResult(result);
- return deferredResult;
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒拌澶囷細 " + deviceId);
}
if (channelId == null) {
- WVPResult<AudioBroadcastResult> result = new WVPResult<>();
- result.setCode(-1);
- result.setMsg("鏈壘鍒伴�氶亾锛� " + channelId);
- DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
- deferredResult.setResult(result);
- return deferredResult;
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒伴�氶亾锛� " + channelId);
}
- String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
- if (resultHolder.exist(key, null)) {
- WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setMsg("璁惧浣跨敤涓�");
- DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
- deferredResult.setResult(wvpResult);
- return deferredResult;
- }
- if (timeout == null){
- timeout = 30;
- }
- DeferredResult<WVPResult<AudioBroadcastResult>> result = new DeferredResult<>(timeout.longValue()*1000 + 2000);
- String uuid = UUID.randomUUID().toString();
- result.onTimeout(()->{
- WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setMsg("璇锋眰瓒呮椂");
- RequestMessage requestMessage = new RequestMessage();
- requestMessage.setKey(key);
- requestMessage.setData(wvpResult);
- resultHolder.invokeAllResult(requestMessage);
- });
- playService.audioBroadcast(device, channelId, timeout, (msg)->{
- WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setMsg(msg);
- RequestMessage requestMessage = new RequestMessage();
- requestMessage.setKey(key);
- requestMessage.setData(wvpResult);
- resultHolder.invokeAllResult(requestMessage);
- });
- resultHolder.put(key, uuid, result);
+ return playService.audioBroadcast(device, channelId);
- return result;
}
@@ -266,12 +238,17 @@
@Parameter(name = "channelId", description = "閫氶亾Id", required = true)
@GetMapping("/broadcast/stop/{deviceId}/{channelId}")
@PostMapping("/broadcast/stop/{deviceId}/{channelId}")
- public WVPResult<String> stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
+ public void stopBroadcast(@PathVariable String deviceId, @PathVariable String channelId) {
if (logger.isDebugEnabled()) {
logger.debug("鍋滄璇煶骞挎挱API璋冪敤");
}
+// try {
+// playService.stopAudioBroadcast(deviceId, channelId);
+// } catch (InvalidArgumentException | ParseException | SsrcTransactionNotFoundException | SipException e) {
+// logger.error("[鍛戒护鍙戦�佸け璐 鍋滄璇煶: {}", e.getMessage());
+// throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+// }
playService.stopAudioBroadcast(deviceId, channelId);
- return new WVPResult<>(0, "success", null);
}
@Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
--
Gitblit v1.8.0