From dfb87c768538e280cf5e17d1d5ee5bbed1e1888d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 10:58:26 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 309 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 9f4a38d..32f0364 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -5,19 +5,23 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
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.bean.*;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+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.HookSubscribeForStreamChange;
@@ -34,8 +38,10 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.AudioBroadcastEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +57,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@@ -67,10 +75,19 @@
private SIPCommander cmder;
@Autowired
- private SIPCommanderFroPlatform sipCommanderFroPlatform;
+ private AudioBroadcastManager audioBroadcastManager;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+ @Autowired
+ private ISIPCommanderForPlatform sipCommanderFroPlatform;
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
private DeferredResultHolder resultHolder;
@@ -90,12 +107,11 @@
@Autowired
private VideoStreamSessionManager streamSession;
-
- @Autowired
- private IDeviceService deviceService;
-
@Autowired
private UserSetting userSetting;
+
+ @Autowired
+ private SipConfig sipConfig;
@Autowired
private DynamicTask dynamicTask;
@@ -108,6 +124,7 @@
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
+
@Override
public void play(MediaServerItem mediaServerItem, String deviceId, String channelId,
ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
@@ -115,9 +132,9 @@
if (mediaServerItem == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑zlm");
}
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
RequestMessage msg = new RequestMessage();
- String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
msg.setKey(key);
Device device = redisCatchStorage.getDevice(deviceId);
@@ -172,7 +189,6 @@
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
streamInfo = null;
-
}
}
if (streamInfo == null) {
@@ -181,7 +197,6 @@
streamId = String.format("%s_%s", device.getDeviceId(), channelId);
}
SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck(), false);
- logger.info(JSONObject.toJSONString(ssrcInfo));
if (ssrcInfo == null) {
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(ErrorCode.ERROR100.getCode());
@@ -189,7 +204,7 @@
msg.setData(wvpResult);
resultHolder.invokeAllResult(msg);
- return playResult;
+ return;
}
play(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInUse, response) -> {
if (hookEvent != null) {
@@ -221,6 +236,193 @@
}
}
+ @Override
+ public void talk(MediaServerItem mediaServerItem, Device device, String channelId,
+ ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
+ Runnable timeoutCallback) {
+ String streamId = null;
+ if (mediaServerItem.isRtpEnable()) {
+ streamId = String.format("%s_%s", device.getDeviceId(), channelId);
+ }
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck(), false);
+ logger.info("[瀵硅寮�濮媇 deviceId: {}, channelId: {},鏀舵祦绔彛锛� {}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, ssrcInfo.getPort(), device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ // 瓒呮椂澶勭悊
+ String timeOutTaskKey = UUID.randomUUID().toString();
+ SSRCInfo finalSsrcInfo = ssrcInfo;
+ System.out.println("璁剧疆瓒呮椂浠诲姟锛� " + timeOutTaskKey);
+ dynamicTask.startDelay(timeOutTaskKey, () -> {
+
+ logger.info("[瀵硅瓒呮椂] 鏀舵祦瓒呮椂 deviceId: {}, channelId: {}锛岀鍙ｏ細{}, SSRC: {}", device.getDeviceId(), channelId, finalSsrcInfo.getPort(), finalSsrcInfo.getSsrc());
+ timeoutCallback.run();
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ try {
+ cmder.streamByeCmd(device, channelId, finalSsrcInfo.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[瀵硅瓒呮椂]锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+ } catch (SsrcTransactionNotFoundException e) {
+ timeoutCallback.run();
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+ mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ }
+ }, userSetting.getPlayTimeout());
+ final String ssrc = ssrcInfo.getSsrc();
+ final String stream = ssrcInfo.getStream();
+ //绔彛鑾峰彇澶辫触鐨剆srcInfo 娌℃湁蹇呰鍙戦�佺偣鎾寚浠�
+ if (ssrcInfo.getPort() <= 0) {
+ logger.info("[瀵硅] 绔彛鍒嗛厤寮傚父锛宒eviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
+ return;
+ }
+
+ String callId = SipUtils.getNewCallId();
+ boolean pushing = false;
+ // 鏌ョ湅璁惧鏄惁宸茬粡鍦ㄦ帹娴�
+// MediaItem mediaItem = zlmrtpServerFactory.getMediaInfo(mediaServerItem, "rtp",ssrcInfo.getStream());
+// if (mediaItem != null) {
+// SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem,
+// mediaItem.getOriginSock().getPeer_ip(), mediaItem.getOriginSock().getPeer_port(), ssrcInfo.getSsrc(), device.getDeviceId(),
+// device.getDeviceId(), channelId,
+// false);
+//
+// sendRtpItem.setTcpActive(false);
+// sendRtpItem.setCallId(callId);
+// sendRtpItem.setPlayType(InviteStreamType.TALK);
+// sendRtpItem.setStatus(1);
+// sendRtpItem.setIp(mediaItem.getOriginSock().getPeer_ip());
+// sendRtpItem.setPort(mediaItem.getOriginSock().getPeer_port());
+// sendRtpItem.setTcpActive(false);
+// sendRtpItem.setStreamId(ssrcInfo.getStream());
+// sendRtpItem.setApp("1000");
+// sendRtpItem.setStreamId("1000");
+// sendRtpItem.setSsrc(ssrc);
+// sendRtpItem.setOnlyAudio(true);
+// redisCatchStorage.updateSendRTPSever(sendRtpItem);
+//
+// Map<String, Object> param = new HashMap<>(12);
+// param.put("vhost","__defaultVhost__");
+// param.put("app",sendRtpItem.getApp());
+// param.put("stream",sendRtpItem.getStreamId());
+// param.put("ssrc", sendRtpItem.getSsrc());
+// param.put("dst_url", sendRtpItem.getIp());
+// param.put("dst_port", sendRtpItem.getPort());
+// param.put("src_port", sendRtpItem.getLocalPort());
+// param.put("pt", sendRtpItem.getPt());
+// param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+// param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
+// param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+// JSONObject jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaServerItem, param);
+// System.out.println(2222);
+// System.out.println(jsonObject);
+// }else {
+ try {
+ cmder.talkStreamCmd(mediaServerItem, ssrcInfo, device, channelId, callId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
+ logger.info("[瀵硅] 娴佸凡鐢熸垚锛� 寮�濮嬫帹娴侊細 " + response.toJSONString());
+ dynamicTask.stop(timeOutTaskKey);
+ // TODO 鏆備笉鍋氬鐞�
+ }, (MediaServerItem mediaServerItemInuse, JSONObject json) -> {
+ logger.info("[瀵硅] 璁惧寮�濮嬫帹娴侊細 " + json.toJSONString());
+ dynamicTask.stop(timeOutTaskKey);
+ // 鑾峰彇杩滅▼IP绔彛 浣滀负鍥炲璇煶娴佺殑鍦板潃
+ String ip = json.getString("ip");
+ Integer port = json.getInteger("port");
+ logger.info("[璁惧寮�濮嬫帹娴乚{}/{}, 鏉ヨ嚜ip锛歿}, 绔彛锛歿}", device.getDeviceId(), channelId, ip, port);
+ // 鏌ョ湅骞冲彴鎺ㄦ祦鏄惁灏辩华
+// Boolean ready = zlmrtpServerFactory.isStreamReady(mediaServerItemInuse, "talk", stream);
+// if (!ready) {
+// try {
+// cmder.streamByeCmd(device, channelId, finalSsrcInfo.getStream(), null);
+// } catch (InvalidArgumentException | ParseException | SipException e) {
+// logger.error("[瀵硅瓒呮椂]锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+// } catch (SsrcTransactionNotFoundException e) {
+// timeoutCallback.run();
+// mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+// mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+// streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+// }
+// }else {
+// try {
+// Thread.sleep(1000);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+ SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, ip, port, ssrcInfo.getSsrc(), device.getDeviceId(),
+ device.getDeviceId(), channelId,
+ false, false);
+
+
+// if (sendRtpItem.getLocalPort() == 0) {
+// logger.warn("鏈嶅姟鍣ㄧ鍙ｈ祫婧愪笉瓒�");
+// try {
+// cmder.streamByeCmd(device, channelId, finalSsrcInfo.getStream(), null);
+// } catch (InvalidArgumentException | ParseException | SipException e) {
+// logger.error("[瀵硅瓒呮椂]锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+// } catch (SsrcTransactionNotFoundException e) {
+// timeoutCallback.run();
+// mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+// mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+// streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+// }
+// return;
+// }
+ sendRtpItem.setTcpActive(false);
+ sendRtpItem.setCallId(callId);
+ sendRtpItem.setPlayType(InviteStreamType.TALK);
+ sendRtpItem.setStatus(1);
+ sendRtpItem.setIp(ip);
+ sendRtpItem.setPort(port);
+ sendRtpItem.setTcpActive(false);
+ sendRtpItem.setApp("1000");
+ sendRtpItem.setStreamId("1000");
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setOnlyAudio(true);
+ sendRtpItem.setRtcp(false);
+ redisCatchStorage.updateSendRTPSever(sendRtpItem);
+
+ Map<String, Object> param = new HashMap<>(12);
+ param.put("vhost","__defaultVhost__");
+ param.put("app",sendRtpItem.getApp());
+ param.put("stream",sendRtpItem.getStreamId());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ param.put("dst_url", sendRtpItem.getIp());
+ param.put("dst_port", sendRtpItem.getPort());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+ JSONObject jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaServerItemInuse, param);
+ System.out.println(11111);
+ System.out.println(sendRtpItem.getIp() + ":" + sendRtpItem.getPort());
+// System.out.println(jsonObject);
+// }
+
+ }, (event) -> {
+
+ }, (event) -> {
+ dynamicTask.stop(timeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ errorEvent.response(event);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+
+ logger.error("[鍛戒护鍙戦�佸け璐 瀵硅娑堟伅: {}", e.getMessage());
+ dynamicTask.stop(timeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
+ eventResult.msg = "鍛戒护鍙戦�佸け璐�";
+ errorEvent.response(eventResult);
+ }
+// }
+
+ }
@Override
public void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
@@ -248,16 +450,14 @@
}
}
}, userSetting.getPlayTimeout());
- final String ssrc = ssrcInfo.getSsrc();
- final String stream = ssrcInfo.getStream();
//绔彛鑾峰彇澶辫触鐨剆srcInfo 娌℃湁蹇呰鍙戦�佺偣鎾寚浠�
if (ssrcInfo.getPort() <= 0) {
logger.info("[鐐规挱绔彛鍒嗛厤寮傚父]锛宒eviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
dynamicTask.stop(timeOutTaskKey);
// 閲婃斁ssrc
- mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
- streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
RequestMessage msg = new RequestMessage();
msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + device.getDeviceId() + channelId);
@@ -274,7 +474,7 @@
onPublishHandlerForPlay(mediaServerItemInuse, response, device.getDeviceId(), channelId);
hookEvent.response(mediaServerItemInuse, response);
logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
- String streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInuse.getRtspPort(), "rtp", stream);
+ String streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInuse.getRtspPort(), "rtp", ssrcInfo.getStream());
String path = "snap";
String fileName = device.getDeviceId() + "_" + channelId + ".jpg";
// 璇锋眰鎴浘
@@ -787,6 +987,100 @@
}
@Override
+ public AudioBroadcastResult audioBroadcast(Device device, String channelId) {
+ if (device == null || channelId == null) {
+ return null;
+ }
+ logger.info("[璇煶鍠婅瘽] device锛� {}, channel: {}", device.getDeviceId(), channelId);
+ DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);
+ if (deviceChannel == null) {
+ logger.warn("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾锛� {}", channelId);
+ return null;
+ }
+ MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad();
+ String app = "broadcast";
+ // TODO 浠巗ip user agent涓垽鏂槸浠�涔堝搧鐗岃澶囷紝澶у崕榛樿浣跨敤talk妯″紡锛屽叾浠栦娇鐢╞roadcast妯″紡
+// String app = "talk";
+ String stream = device.getDeviceId() + "_" + channelId;
+ StreamInfo broadcast = mediaService.getStreamInfoByAppAndStream(mediaServerItem, "broadcast", stream, null, null, null, false);
+ AudioBroadcastResult audioBroadcastResult = new AudioBroadcastResult();
+ audioBroadcastResult.setApp(app);
+ audioBroadcastResult.setStream(stream);
+ audioBroadcastResult.setStreamInfo(mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, stream, null, null, null,false));
+ audioBroadcastResult.setCodec("G.711");
+ return audioBroadcastResult;
+ }
+
+ @Override
+ public void audioBroadcastCmd(Device device, String channelId, int timeout, AudioBroadcastEvent event) throws InvalidArgumentException, ParseException, SipException {
+ if (device == null || channelId == null) {
+ return;
+ }
+ logger.info("[璇煶鍠婅瘽] device锛� {}, channel: {}", device.getDeviceId(), channelId);
+ DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);
+ if (deviceChannel == null) {
+ logger.warn("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾锛� {}", channelId);
+ event.call("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾");
+ return;
+ }
+ // 鏌ヨ閫氶亾浣跨敤鐘舵��
+ if (audioBroadcastManager.exit(device.getDeviceId(), channelId)) {
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
+ if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
+ // 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
+ MediaServerItem mediaServerItem = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmrtpServerFactory.isStreamReady(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStreamId());
+ if (streamReady) {
+ logger.warn("璇煶骞挎挱宸茬粡寮�鍚細 {}", channelId);
+ event.call("璇煶骞挎挱宸茬粡寮�鍚�");
+ return;
+ } else {
+ audioBroadcastManager.del(deviceChannel.getDeviceId(), channelId);
+ redisCatchStorage.deleteSendRTPServer(device.getDeviceId(), channelId, sendRtpItem.getCallId(), sendRtpItem.getStreamId());
+ }
+ }
+ }
+
+ // 鍙戦�侀�氱煡
+ cmder.audioBroadcastCmd(device, channelId, eventResultForOk -> {
+ // 鍙戦�佹垚鍔�
+ AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, AudioBroadcastCatchStatus.Ready);
+ audioBroadcastManager.add(audioBroadcastCatch);
+ }, eventResultForError -> {
+ // 鍙戦�佸け璐�
+ logger.error("璇煶骞挎挱鍙戦�佸け璐ワ細 {}:{}", channelId, eventResultForError.msg);
+ event.call("璇煶骞挎挱鍙戦�佸け璐�");
+ stopAudioBroadcast(device.getDeviceId(), channelId);
+ });
+ }
+
+
+
+ @Override
+ public void stopAudioBroadcast(String deviceId, String channelId) {
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(deviceId, channelId);
+ if (audioBroadcastCatch != null) {
+
+ Device device = deviceService.getDevice(deviceId);
+ if (device == null) {
+ return;
+ }
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(deviceId, audioBroadcastCatch.getChannelId(), null, null);
+ if (sendRtpItem != null) {
+ redisCatchStorage.deleteSendRTPServer(deviceId, sendRtpItem.getChannelId(), null, null);
+ MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStreamId());
+ zlmresTfulUtils.stopSendRtp(mediaInfo, param);
+ }
+
+ audioBroadcastManager.del(deviceId, channelId);
+ }
+ }
+
+ @Override
public void zlmServerOnline(String mediaServerId) {
// TODO 鏌ユ壘涔嬪墠鐨勭偣鎾紝娴佸鏋滀笉瀛樺湪鍒欑粰涓嬬骇鍙戦�乥ye
// MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
--
Gitblit v1.8.0