From ca16a79255f27709f88abc59bea362abdd1e2cc7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 五月 2022 09:52:02 +0800
Subject: [PATCH] 添加语音发送通道和语音接收通道字段
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 20ffc00..dc88da0 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
@@ -251,20 +251,32 @@
@ApiOperation("璇煶骞挎挱鍛戒护")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelForSend", value = "璁惧鐢ㄤ簬鍙戦�佽闊虫暟鎹殑閫氶亾", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelForReceive", value = "璁惧鐢ㄤ簬鎺ユ敹璇煶鏁版嵁鐨勯�氶亾", dataTypeClass = String.class),
})
@GetMapping("/broadcast/{deviceId}")
@PostMapping("/broadcast/{deviceId}")
- public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId) {
+ public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId,
+ String channelForSend,
+ String channelForReceive) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(3 * 1000L);
String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
if (resultHolder.exist(key, null)) {
result.setResult(new ResponseEntity<>("璁惧浣跨敤涓�",HttpStatus.OK));
return result;
}
+
+// playService.audioBroadcast(deviceId, channelForSend, channelForReceive);
+
+
+
+
+
+
String uuid = UUID.randomUUID().toString();
if (device == null) {
--
Gitblit v1.8.0