From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java | 222 +++++++++++++++++++------------------------------------
1 files changed, 76 insertions(+), 146 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
old mode 100644
new mode 100755
index ba4473f..7832e37
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
@@ -1,23 +1,24 @@
package com.genersoft.iot.vmp.vmanager.rtp;
-import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.hook.Hook;
+import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
+import com.genersoft.iot.vmp.media.event.hook.HookType;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
-import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
-import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
-import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -29,9 +30,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -42,19 +41,16 @@
@RequestMapping("/api/rtp")
public class RtpController {
+ @Autowired
+ private SendRtpPortManager sendRtpPortManager;
+
private final static Logger logger = LoggerFactory.getLogger(RtpController.class);
@Autowired
- private ZLMRTPServerFactory zlmServerFactory;
-
- @Autowired
- private ZlmHttpHookSubscribe hookSubscribe;
+ private HookSubscribe hookSubscribe;
@Autowired
private IMediaServerService mediaServerService;
-
- @Autowired
- private SendRtpPortManager sendRtpPortManager;
@Autowired
private UserSetting userSetting;
@@ -62,14 +58,13 @@
@Autowired
private DynamicTask dynamicTask;
-
@Autowired
private RedisTemplate<Object, Object> redisTemplate;
@GetMapping(value = "/receive/open")
@ResponseBody
- @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅")
+ @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "isSend", description = "鏄惁鍙戦�侊紝false鏃跺彧寮�鍚敹娴侊紝 true鍚屾椂杩斿洖鎺ㄦ祦淇℃伅", required = true)
@Parameter(name = "callId", description = "鏁翠釜杩囩▼鐨勫敮涓�鏍囪瘑锛屼负浜嗕笌鍚庣画鎺ュ彛鍏宠仈", required = true)
@Parameter(name = "ssrc", description = "鏉ユ簮娴佺殑SSRC锛屼笉浼犲垯涓嶆牎楠屾潵婧恠src", required = false)
@@ -81,8 +76,8 @@
logger.info("[绗笁鏂规湇鍔″鎺�->寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] isSend->{}, ssrc->{}, callId->{}, stream->{}, tcpMode->{}, callBack->{}",
isSend, ssrc, callId, stream, tcpMode==0?"UDP":"TCP琚姩", callBack);
- MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
- if (mediaServerItem == null) {
+ MediaServer mediaServer = mediaServerService.getDefaultMediaServer();
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"娌℃湁鍙敤鐨凪ediaServer");
}
if (stream == null) {
@@ -91,30 +86,28 @@
if (isSend != null && isSend && callId == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"isSend涓簍rue鏃讹紝CallID涓嶈兘涓虹┖");
}
- int ssrcInt = 0;
+ long ssrcInt = 0;
if (ssrc != null) {
try {
- ssrcInt = Integer.parseInt(ssrc);
+ ssrcInt = Long.parseLong(ssrc);
}catch (NumberFormatException e) {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"ssrc鏍煎紡閿欒");
}
}
String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_" + callId + "_" + stream;
- int localPortForVideo = zlmServerFactory.createRTPServer(mediaServerItem, stream, ssrcInt, null, false, tcpMode);
- int localPortForAudio = zlmServerFactory.createRTPServer(mediaServerItem, stream + "_a" , ssrcInt, null, false, tcpMode);
- if (localPortForVideo == 0 || localPortForAudio == 0) {
+ SSRCInfo ssrcInfoForVideo = mediaServerService.openRTPServer(mediaServer, stream, ssrcInt + "",false,false, null, false, false, false, tcpMode);
+ SSRCInfo ssrcInfoForAudio = mediaServerService.openRTPServer(mediaServer, stream + "_a", ssrcInt + "", false, false, null, false,false,false, tcpMode);
+ if (ssrcInfoForVideo.getPort() == 0 || ssrcInfoForAudio.getPort() == 0) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鑾峰彇绔彛澶辫触");
}
// 娉ㄥ唽鍥炶皟濡傛灉rtp鏀舵祦瓒呮椂鍒欓�氳繃鍥炶皟鍙戦�侀�氱煡
if (callBack != null) {
- HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(stream, String.valueOf(ssrcInt), mediaServerItem.getId());
+ Hook hook = Hook.getInstance(HookType.on_rtp_server_timeout, "rtp", stream, mediaServer.getId());
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
- hookSubscribe.addSubscribe(hookSubscribeForRtpServerTimeout,
- (mediaServerItemInUse, response)->{
- if (stream.equals(response.getString("stream_id"))) {
- logger.info("[绗笁鏂规湇鍔″鎺�->寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] 绛夊緟鏀舵祦瓒呮椂 callId->{}, 鍙戦�佸洖璋�", callId);
- // 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
- redisTemplate.delete(receiveKey);
+ hookSubscribe.addSubscribe(hook,
+ (hookData)->{
+ if (stream.equals(hookData.getStream())) {
+ logger.info("[寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] 绛夊緟鏀舵祦瓒呮椂 callId->{}, 鍙戦�佸洖璋�", callId);
OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
OkHttpClient client = httpClientBuilder.build();
String url = callBack + "?callId=" + callId;
@@ -124,44 +117,46 @@
} catch (IOException e) {
logger.error("[绗笁鏂规湇鍔″鎺�->寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] 绛夊緟鏀舵祦瓒呮椂 callId->{}, 鍙戦�佸洖璋冨け璐�", callId, e);
}
- hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
+ hookSubscribe.removeSubscribe(hook);
}
});
}
+ String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_" + callId;
OtherRtpSendInfo otherRtpSendInfo = new OtherRtpSendInfo();
- otherRtpSendInfo.setReceiveIp(mediaServerItem.getSdpIp());
- otherRtpSendInfo.setReceivePortForVideo(localPortForVideo);
- otherRtpSendInfo.setReceivePortForAudio(localPortForAudio);
+ otherRtpSendInfo.setReceiveIp(mediaServer.getSdpIp());
+ otherRtpSendInfo.setReceivePortForVideo(ssrcInfoForVideo.getPort());
+ otherRtpSendInfo.setReceivePortForAudio(ssrcInfoForAudio.getPort());
otherRtpSendInfo.setCallId(callId);
otherRtpSendInfo.setStream(stream);
// 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo);
if (isSend != null && isSend) {
- String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_" + callId;
// 棰勫垱寤哄彂娴佷俊鎭�
- int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem);
- int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem);
+ int portForVideo = sendRtpPortManager.getNextPort(mediaServer);
+ int portForAudio = sendRtpPortManager.getNextPort(mediaServer);
- otherRtpSendInfo.setSendLocalIp(mediaServerItem.getSdpIp());
+ otherRtpSendInfo.setSendLocalIp(mediaServer.getSdpIp());
otherRtpSendInfo.setSendLocalPortForVideo(portForVideo);
otherRtpSendInfo.setSendLocalPortForAudio(portForAudio);
// 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
logger.info("[绗笁鏂规湇鍔″鎺�->寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] 缁撴灉锛宑allId->{}锛� {}", callId, otherRtpSendInfo);
}
+ // 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
+ redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
return otherRtpSendInfo;
}
@GetMapping(value = "/receive/close")
@ResponseBody
- @Operation(summary = "鍏抽棴鏀舵祦")
+ @Operation(summary = "鍏抽棴鏀舵祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "stream", description = "娴佺殑ID", required = true)
public void closeRtpServer(String stream) {
logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鏀舵祦] stream->{}", stream);
- MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
- zlmServerFactory.closeRtpServer(mediaServerItem,stream);
- zlmServerFactory.closeRtpServer(mediaServerItem,stream + "_a");
+ MediaServer mediaServerItem = mediaServerService.getDefaultMediaServer();
+ mediaServerService.closeRTPServer(mediaServerItem, stream);
+ mediaServerService.closeRTPServer(mediaServerItem, stream+ "_a");
String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_*_" + stream;
List<Object> scan = RedisUtil.scan(redisTemplate, receiveKey);
if (scan.size() > 0) {
@@ -174,7 +169,7 @@
@GetMapping(value = "/send/start")
@ResponseBody
- @Operation(summary = "鍙戦�佹祦")
+ @Operation(summary = "鍙戦�佹祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "ssrc", description = "鍙戦�佹祦鐨凷SRC", required = true)
@Parameter(name = "dstIpForAudio", description = "鐩爣闊抽鏀舵祦IP", required = false)
@Parameter(name = "dstIpForVideo", description = "鐩爣瑙嗛鏀舵祦IP", required = false)
@@ -222,7 +217,7 @@
if (!((dstPortForAudio > 0 && !ObjectUtils.isEmpty(dstPortForAudio) || (dstPortForVideo > 0 && !ObjectUtils.isEmpty(dstIpForVideo))))) {
throw new ControllerException(ErrorCode.ERROR400.getCode(), "鑷冲皯搴旇瀛樺湪涓�缁勯煶棰戞垨瑙嗛鍙戦�佸弬鏁�");
}
- MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
+ MediaServer mediaServer = mediaServerService.getDefaultMediaServer();
String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_" + callId;
OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
if (sendInfo == null) {
@@ -232,90 +227,47 @@
sendInfo.setPushStream(stream);
sendInfo.setPushSSRC(ssrc);
- Map<String, Object> paramForAudio;
- Map<String, Object> paramForVideo;
+
+ SendRtpItem sendRtpItemForVideo;
+ SendRtpItem sendRtpItemForAudio;
if (!ObjectUtils.isEmpty(dstIpForAudio) && dstPortForAudio > 0) {
- paramForAudio = new HashMap<>();
- paramForAudio.put("vhost","__defaultVhost__");
- paramForAudio.put("app",app);
- paramForAudio.put("stream",stream);
- paramForAudio.put("ssrc", ssrc);
-
- paramForAudio.put("dst_url", dstIpForAudio);
- paramForAudio.put("dst_port", dstPortForAudio);
- String is_Udp = isUdp ? "1" : "0";
- paramForAudio.put("is_udp", is_Udp);
- paramForAudio.put("src_port", sendInfo.getSendLocalPortForAudio());
- paramForAudio.put("use_ps", "0");
- paramForAudio.put("only_audio", "1");
- if (ptForAudio != null) {
- paramForAudio.put("pt", ptForAudio);
- }
-
+ sendRtpItemForAudio = SendRtpItem.getInstance(app, stream, ssrc, dstIpForAudio, dstPortForAudio, !isUdp, sendInfo.getSendLocalPortForAudio(), ptForAudio);
} else {
- paramForAudio = null;
+ sendRtpItemForAudio = null;
}
if (!ObjectUtils.isEmpty(dstIpForVideo) && dstPortForVideo > 0) {
- paramForVideo = new HashMap<>();
- paramForVideo.put("vhost","__defaultVhost__");
- paramForVideo.put("app",app);
- paramForVideo.put("stream",stream);
- paramForVideo.put("ssrc", ssrc);
-
- paramForVideo.put("dst_url", dstIpForVideo);
- paramForVideo.put("dst_port", dstPortForVideo);
- String is_Udp = isUdp ? "1" : "0";
- paramForVideo.put("is_udp", is_Udp);
- paramForVideo.put("src_port", sendInfo.getSendLocalPortForVideo());
- paramForVideo.put("use_ps", "0");
- paramForVideo.put("only_audio", "0");
- if (ptForVideo != null) {
- paramForVideo.put("pt", ptForVideo);
- }
-
+ sendRtpItemForVideo = SendRtpItem.getInstance(app, stream, ssrc, dstIpForAudio, dstPortForAudio, !isUdp, sendInfo.getSendLocalPortForVideo(), ptForVideo);
} else {
- paramForVideo = null;
+ sendRtpItemForVideo = null;
}
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, app, stream);
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServer, app, stream);
if (streamReady) {
- if (paramForVideo != null) {
- JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForVideo);
- if (jsonObject.getInteger("code") == 0) {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, paramForVideo);
- redisTemplate.opsForValue().set(key, sendInfo);
- }else {
- redisTemplate.delete(key);
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佸け璐ワ紝callId->{}, {}", callId, jsonObject.getString("msg"));
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "[瑙嗛娴佸彂娴佸け璐 " + jsonObject.getString("msg"));
- }
+ if (sendRtpItemForVideo != null) {
+ mediaServerService.startSendRtp(mediaServer, sendRtpItemForVideo);
+ logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, sendRtpItemForVideo);
+ redisTemplate.opsForValue().set(key, sendInfo);
}
- if(paramForAudio != null) {
- JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForAudio);
- if (jsonObject.getInteger("code") == 0) {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, paramForAudio);
- redisTemplate.opsForValue().set(key, sendInfo);
- }else {
- redisTemplate.delete(key);
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佸け璐ワ紝callId->{}, {}", callId, jsonObject.getString("msg"));
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "[闊抽娴佸彂娴佸け璐 " + jsonObject.getString("msg"));
- }
+ if(sendRtpItemForAudio != null) {
+ mediaServerService.startSendRtp(mediaServer, sendRtpItemForAudio);
+ logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, sendRtpItemForAudio);
+ redisTemplate.opsForValue().set(key, sendInfo);
}
}else {
logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 娴佷笉瀛樺湪锛岀瓑寰呮祦涓婄嚎锛宑allId->{}", callId);
String uuid = UUID.randomUUID().toString();
- HookSubscribeForStreamChange hookSubscribeForStreamChange = HookSubscribeFactory.on_stream_changed(app, stream, true, "rtsp", mediaServerItem.getId());
+ Hook hook = Hook.getInstance(HookType.on_media_arrival, app, stream, mediaServer.getId());
dynamicTask.startDelay(uuid, ()->{
logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 绛夊緟娴佷笂绾胯秴鏃� callId->{}", callId);
redisTemplate.delete(key);
- hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
+ hookSubscribe.removeSubscribe(hook);
}, 10000);
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
+ hookSubscribe.removeSubscribe(hook);
OtherRtpSendInfo finalSendInfo = sendInfo;
- hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
- hookSubscribe.addSubscribe(hookSubscribeForStreamChange,
- (mediaServerItemInUse, response)->{
+ hookSubscribe.addSubscribe(hook,
+ (hookData)->{
dynamicTask.stop(uuid);
logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 娴佷笂绾匡紝寮�濮嬪彂娴� callId->{}", callId);
try {
@@ -323,36 +275,24 @@
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- if (paramForVideo != null) {
- JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForVideo);
- if (jsonObject.getInteger("code") == 0) {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, paramForVideo);
- redisTemplate.opsForValue().set(key, finalSendInfo);
- }else {
- redisTemplate.delete(key);
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佸け璐ワ紝callId->{}, {}", callId, jsonObject.getString("msg"));
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "[瑙嗛娴佸彂娴佸け璐 " + jsonObject.getString("msg"));
- }
+ if (sendRtpItemForVideo != null) {
+ mediaServerService.startSendRtp(mediaServer, sendRtpItemForVideo);
+ logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 瑙嗛娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, sendRtpItemForVideo);
+ redisTemplate.opsForValue().set(key, finalSendInfo);
}
- if(paramForAudio != null) {
- JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForAudio);
- if (jsonObject.getInteger("code") == 0) {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, paramForAudio);
- redisTemplate.opsForValue().set(key, finalSendInfo);
- }else {
- redisTemplate.delete(key);
- logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佸け璐ワ紝callId->{}, {}", callId, jsonObject.getString("msg"));
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "[闊抽娴佸彂娴佸け璐 " + jsonObject.getString("msg"));
- }
+ if(sendRtpItemForAudio != null) {
+ mediaServerService.startSendRtp(mediaServer, sendRtpItemForAudio);
+ logger.info("[绗笁鏂规湇鍔″鎺�->鍙戦�佹祦] 闊抽娴佸彂娴佹垚鍔燂紝callId->{}锛宲aram->{}", callId, sendRtpItemForAudio);
+ redisTemplate.opsForValue().set(key, finalSendInfo);
}
- hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
+ hookSubscribe.removeSubscribe(hook);
});
}
}
@GetMapping(value = "/send/stop")
@ResponseBody
- @Operation(summary = "鍏抽棴鍙戦�佹祦")
+ @Operation(summary = "鍏抽棴鍙戦�佹祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "callId", description = "鏁翠釜杩囩▼鐨勫敮涓�鏍囪瘑锛屼笉浼犲垯浣跨敤闅忔満绔彛鍙戞祦", required = true)
public void closeSendRTP(String callId) {
logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鍙戦�佹祦] callId->{}", callId);
@@ -361,19 +301,9 @@
if (sendInfo == null){
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈紑鍚彂娴�");
}
- Map<String, Object> param = new HashMap<>();
- param.put("vhost","__defaultVhost__");
- param.put("app",sendInfo.getPushApp());
- param.put("stream",sendInfo.getPushStream());
- param.put("ssrc",sendInfo.getPushSSRC());
- MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
- Boolean result = zlmServerFactory.stopSendRtpStream(mediaServerItem, param);
- if (!result) {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鍙戦�佹祦] 澶辫触 callId->{}", callId);
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍋滄鍙戞祦澶辫触");
- }else {
- logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鍙戦�佹祦] 鎴愬姛 callId->{}", callId);
- }
+ MediaServer mediaServerItem = mediaServerService.getDefaultMediaServer();
+ mediaServerService.stopSendRtp(mediaServerItem, sendInfo.getPushApp(), sendInfo.getPushStream(), sendInfo.getPushSSRC());
+ logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鍙戦�佹祦] 鎴愬姛 callId->{}", callId);
redisTemplate.delete(key);
}
--
Gitblit v1.8.0