From 11c7deb876806a6bc85fbb3cbbbe5bb531e1cbdc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 七月 2023 15:35:22 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 1560 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 980 insertions(+), 580 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 d198882..e0946b5 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
@@ -1,8 +1,9 @@
package com.genersoft.iot.vmp.service.impl;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionStatus;
+import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -13,45 +14,50 @@
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.SSRCFactory;
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.utils.SipUtils;
+import com.genersoft.iot.vmp.media.zlm.*;
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.ZLMServerFactory;
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.IDeviceService;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.IMediaService;
-import com.genersoft.iot.vmp.service.IPlayService;
-import com.genersoft.iot.vmp.service.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.HookParam;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.service.*;
+import com.genersoft.iot.vmp.service.bean.ErrorCallback;
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
+import com.genersoft.iot.vmp.service.bean.RequestPushStreamMsg;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
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.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.AudioBroadcastEvent;
import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import javax.sdp.*;
import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
import javax.sip.SipException;
import javax.sip.header.CallIdHeader;
+import java.io.File;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
@@ -82,13 +88,19 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
+ private ZLMServerFactory zlmServerFactory;
@Autowired
- private DeferredResultHolder resultHolder;
+ private IInviteStreamService inviteStreamService;
+
+ @Autowired
+ private SendRtpPortManager sendRtpPortManager;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private AssistRESTfulUtils assistRESTfulUtils;
@@ -128,325 +140,279 @@
@Autowired
private ZlmHttpHookSubscribe hookSubscribe;
+ @Autowired
+ private SSRCFactory ssrcFactory;
+
+ @Autowired
+ private RedisTemplate<Object, Object> redisTemplate;
+
@Override
- public void play(MediaServerItem mediaServerItem, String deviceId, String channelId,
- ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
- Runnable timeoutCallback) {
+ public SSRCInfo play(MediaServerItem mediaServerItem, String deviceId, String channelId, String ssrc, ErrorCallback<Object> callback) {
if (mediaServerItem == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑zlm");
}
- String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
-
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
Device device = redisCatchStorage.getDevice(deviceId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+ if (inviteInfo != null ) {
+ if (inviteInfo.getStreamInfo() == null) {
+ // 鐐规挱鍙戣捣浜嗕絾鏄皻鏈垚鍔�, 浠呮敞鍐屽洖璋冪瓑寰呯粨鏋滃嵆鍙�
+ inviteStreamService.once(InviteSessionType.PLAY, deviceId, channelId, null, callback);
+ return inviteInfo.getSsrcInfo();
+ }else {
+ StreamInfo streamInfo = inviteInfo.getStreamInfo();
+ String streamId = streamInfo.getStream();
+ if (streamId == null) {
+ callback.run(InviteErrorCode.ERROR_FOR_CATCH_DATA.getCode(), "鐐规挱澶辫触锛� redis缂撳瓨streamId绛変簬null", null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_CATCH_DATA.getCode(),
+ "鐐规挱澶辫触锛� redis缂撳瓨streamId绛変簬null",
+ null);
+ return inviteInfo.getSsrcInfo();
+ }
+ String mediaServerId = streamInfo.getMediaServerId();
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (streamInfo != null) {
- String streamId = streamInfo.getStream();
- if (streamId == null) {
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg("鐐规挱澶辫触锛� redis缂撳瓨streamId绛変簬null");
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- return;
- }
- String mediaServerId = streamInfo.getMediaServerId();
- MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
-
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
- if (rtpInfo.getInteger("code") == 0) {
- if (rtpInfo.getBoolean("exist")) {
- int localPort = rtpInfo.getInteger("local_port");
- if (localPort == 0) {
- logger.warn("[鐐规挱]锛岀偣鎾椂鍙戠幇rtpServerC瀛樺湪锛屼絾鏄皻鏈紑濮嬫帹娴�");
- // 姝ゆ椂璇存槑rtpServer宸茬粡鍒涘缓浣嗘槸娴佽繕娌℃湁鎺ㄤ笂鏉�
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg("鐐规挱宸茬粡鍦ㄨ繘琛屼腑锛岃绋嶅�欓噸璇�");
- msg.setData(wvpResult);
-
- resultHolder.invokeAllResult(msg);
- return;
- } else {
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.SUCCESS.getCode());
- wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
- wvpResult.setData(streamInfo);
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- if (hookEvent != null) {
- hookEvent.response(mediaServerItem, JSON.parseObject(JSON.toJSONString(streamInfo)));
- }
- }
-
- } else {
- redisCatchStorage.stopPlay(streamInfo);
+ Boolean ready = zlmServerFactory.isStreamReady(mediaInfo, "rtp", streamId);
+ if (ready != null && ready) {
+ callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.SUCCESS.getCode(),
+ InviteErrorCode.SUCCESS.getMsg(),
+ streamInfo);
+ return inviteInfo.getSsrcInfo();
+ }else {
+ // 鐐规挱鍙戣捣浜嗕絾鏄皻鏈垚鍔�, 浠呮敞鍐屽洖璋冪瓑寰呯粨鏋滃嵆鍙�
+ inviteStreamService.once(InviteSessionType.PLAY, deviceId, channelId, null, callback);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- streamInfo = null;
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
}
- } else {
- //zlm杩炴帴澶辫触
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- streamInfo = null;
}
}
- if (streamInfo == null) {
- String streamId = null;
- if (mediaServerItem.isRtpEnable()) {
- streamId = String.format("%s_%s", device.getDeviceId(), channelId);
- }
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck(), false);
- if (ssrcInfo == null) {
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg("寮�鍚敹娴佸け璐�");
- msg.setData(wvpResult);
-
- resultHolder.invokeAllResult(msg);
- return;
- }
- play(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInUse, response) -> {
- if (hookEvent != null) {
- hookEvent.response(mediaServerItem, response);
- }
- }, event -> {
- // sip error閿欒
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- if (errorEvent != null) {
- errorEvent.response(event);
- }
- }, (code, msgStr) -> {
- // invite鐐规挱瓒呮椂
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- if (code == 0) {
- wvpResult.setMsg("鐐规挱瓒呮椂锛岃绋嶅�欓噸璇�");
- } else if (code == 1) {
- wvpResult.setMsg("鏀舵祦瓒呮椂锛岃绋嶅�欓噸璇�");
- }
- msg.setData(wvpResult);
- // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
- resultHolder.invokeAllResult(msg);
- });
- }
- }
-
- @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());
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, null, device.isSsrcCheck(), false, 0, false, false,device.getStreamModeForParam());
+ if (ssrcInfo == null) {
+ callback.run(InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getCode(), InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getCode(),
+ InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getMsg(),
+ null);
+ return null;
+ }
+ // TODO 璁板綍鐐规挱鐨勭姸鎬�
+ play(mediaServerItem, ssrcInfo, device, channelId, callback);
+ return ssrcInfo;
+ }
+
+ private void talk(MediaServerItem mediaServerItem, Device device, String channelId, String stream,
+ ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
+ Runnable timeoutCallback, AudioBroadcastEvent audioEvent) {
+
+ String playSsrc = ssrcFactory.getPlaySsrc(mediaServerItem.getId());
+
+ if (playSsrc == null) {
+ audioEvent.call("ssrc宸茬粡鐢ㄥ敖");
+ return;
+ }
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setApp("talk");
+ sendRtpItem.setStream(stream);
+ sendRtpItem.setSsrc(playSsrc);
+ sendRtpItem.setDeviceId(device.getDeviceId());
+ sendRtpItem.setPlatformId(device.getDeviceId());
+ sendRtpItem.setChannelId(channelId);
+ sendRtpItem.setRtcp(false);
+ sendRtpItem.setMediaServerId(mediaServerItem.getId());
+ sendRtpItem.setOnlyAudio(true);
+ sendRtpItem.setPlayType(InviteStreamType.TALK);
+ sendRtpItem.setPt(8);
+ sendRtpItem.setStatus(1);
+ sendRtpItem.setTcpActive(false);
+ sendRtpItem.setTcp(true);
+ sendRtpItem.setUsePs(false);
+ sendRtpItem.setReceiveStream(stream + "_talk");
+
+ String callId = SipUtils.getNewCallId();
+ int port = sendRtpPortManager.getNextPort(mediaServerItem.getId());
+ //绔彛鑾峰彇澶辫触鐨剆srcInfo 娌℃湁蹇呰鍙戦�佺偣鎾寚浠�
+ if (port <= 0) {
+ logger.info("[璇煶瀵硅] 绔彛鍒嗛厤寮傚父锛宒eviceId={},channelId={}", device.getDeviceId(), channelId);
+ audioEvent.call("绔彛鍒嗛厤寮傚父");
+ return;
+ }
+ sendRtpItem.setLocalPort(port);
+ sendRtpItem.setPort(port);
+ logger.info("[璇煶瀵硅]寮�濮� deviceId: {}, channelId: {},鏀舵祦绔彛锛� {}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, sendRtpItem.getLocalPort(), device.getStreamMode(), sendRtpItem.getSsrc(), false);
// 瓒呮椂澶勭悊
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());
+ logger.info("[璇煶瀵硅] 鏀舵祦瓒呮椂 deviceId: {}, channelId: {}锛岀鍙ｏ細{}, SSRC: {}", device.getDeviceId(), channelId, sendRtpItem.getPort(), sendRtpItem.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) {
+ cmder.streamByeCmd(device, channelId, sendRtpItem.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ logger.error("[璇煶瀵硅]瓒呮椂锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+ } finally {
timeoutCallback.run();
- mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
- mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
- streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
+ streamSession.remove(device.getDeviceId(), channelId, sendRtpItem.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;
+ Map<String, Object> param = new HashMap<>(12);
+ param.put("vhost","__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+ param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
+ param.put("recv_stream_id", sendRtpItem.getReceiveStream());
+ param.put("close_delay_ms", userSetting.getPlayTimeout() * 1000);
+
+ zlmServerFactory.startSendRtpPassive(mediaServerItem, param, jsonObject -> {
+ if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
+ logger.info("[璇煶瀵硅]澶辫触 deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
+ audioEvent.call("澶辫触, " + jsonObject.getString("msg"));
+ // 鏌ョ湅鏄惁宸茬粡寤虹珛浜嗛�氶亾锛屽瓨鍦ㄥ垯鍙戦�乥ye
+ stopTalk(device, channelId);
+ }
+ });
+
+
// 鏌ョ湅璁惧鏄惁宸茬粡鍦ㄦ帹娴�
-// 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);
+ try {
+ cmder.talkStreamCmd(mediaServerItem, sendRtpItem, device, channelId, callId, (mediaServerItemInuse, hookParam) -> {
+ logger.info("[璇煶瀵硅] 娴佸凡鐢熸垚锛� 寮�濮嬫帹娴侊細 " + hookParam);
+ dynamicTask.stop(timeOutTaskKey);
+ // TODO 鏆備笉鍋氬鐞�
+ }, (mediaServerItemInuse, hookParam) -> {
+ logger.info("[璇煶瀵硅] 璁惧寮�濮嬫帹娴侊細 " + hookParam);
+ dynamicTask.stop(timeOutTaskKey);
+ }, (event) -> {
+ dynamicTask.stop(timeOutTaskKey);
-// 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);
+ if (event.event instanceof ResponseEvent) {
+ ResponseEvent responseEvent = (ResponseEvent) event.event;
+ if (responseEvent.getResponse() instanceof SIPResponse) {
+ SIPResponse response = (SIPResponse) responseEvent.getResponse();
+ sendRtpItem.setFromTag(response.getFromTag());
+ sendRtpItem.setToTag(response.getToTag());
+ sendRtpItem.setCallId(response.getCallIdHeader().getCallId());
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);
-// }
+ streamSession.put(device.getDeviceId(), channelId, "talk",
+ sendRtpItem.getStream(), sendRtpItem.getSsrc(), sendRtpItem.getMediaServerId(),
+ response, InviteSessionType.TALK);
+ } else {
+ logger.error("[璇煶瀵硅]鏀跺埌鐨勬秷鎭敊璇紝response涓嶆槸SIPResponse");
+ }
+ } else {
+ logger.error("[璇煶瀵硅]鏀跺埌鐨勬秷鎭敊璇紝event涓嶆槸ResponseEvent");
+ }
- }, (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());
+ }, (event) -> {
dynamicTask.stop(timeOutTaskKey);
- mediaServerService.closeRTPServer(mediaServerItem, finalSsrcInfo.getStream());
+ mediaServerService.closeRTPServer(mediaServerItem, sendRtpItem.getStream());
// 閲婃斁ssrc
- mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
+ streamSession.remove(device.getDeviceId(), channelId, sendRtpItem.getStream());
+ errorEvent.response(event);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
- streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
- eventResult.msg = "鍛戒护鍙戦�佸け璐�";
- errorEvent.response(eventResult);
- }
+ logger.error("[鍛戒护鍙戦�佸け璐 瀵硅娑堟伅: {}", e.getMessage());
+ dynamicTask.stop(timeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, sendRtpItem.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, sendRtpItem.getStream());
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+ eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+ eventResult.statusCode = -1;
+ eventResult.msg = "鍛戒护鍙戦�佸け璐�";
+ errorEvent.response(eventResult);
+ }
// }
}
+
+
@Override
public void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
- ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
- InviteTimeOutCallback timeoutCallback) {
+ ErrorCallback<Object> callback) {
- logger.info("[鐐规挱寮�濮媇 deviceId: {}, channelId: {},鏀舵祦绔彛锛� {}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, ssrcInfo.getPort(), device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ if (mediaServerItem == null || ssrcInfo == null) {
+ callback.run(InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getCode(),
+ InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getMsg(),
+ null);
+ return;
+ }
+ logger.info("[鐐规挱寮�濮媇 deviceId: {}, channelId: {},鐮佹祦绫诲瀷锛歿}, 鏀舵祦绔彛锛� {}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}",
+ device.getDeviceId(), channelId, device.isSwitchPrimarySubStream() ? "杈呯爜娴�" : "涓荤爜娴�", ssrcInfo.getPort(),
+ device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ //绔彛鑾峰彇澶辫触鐨剆srcInfo 娌℃湁蹇呰鍙戦�佺偣鎾寚浠�
+ if (ssrcInfo.getPort() <= 0) {
+ logger.info("[鐐规挱绔彛鍒嗛厤寮傚父]锛宒eviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getCode(), "鐐规挱绔彛鍒嗛厤寮傚父", null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_RESOURCE_EXHAUSTION.getCode(), "鐐规挱绔彛鍒嗛厤寮傚父", null);
+ return;
+ }
+
+ // 鍒濆鍖杛edis涓殑invite娑堟伅鐘舵��
+ InviteInfo inviteInfo = InviteInfo.getInviteInfo(device.getDeviceId(), channelId, ssrcInfo.getStream(), ssrcInfo,
+ mediaServerItem.getSdpIp(), ssrcInfo.getPort(), device.getStreamMode(), InviteSessionType.PLAY,
+ InviteSessionStatus.ready);
+ inviteInfo.setSubStream(device.isSwitchPrimarySubStream());
+ inviteStreamService.updateInviteInfo(inviteInfo);
// 瓒呮椂澶勭悊
String timeOutTaskKey = UUID.randomUUID().toString();
dynamicTask.startDelay(timeOutTaskKey, () -> {
// 鎵ц瓒呮椂浠诲姟鏃舵煡璇㈡槸鍚﹀凡缁忔垚鍔燂紝鎴愬姛浜嗗垯涓嶆墽琛岃秴鏃朵换鍔★紝闃叉瓒呮椂浠诲姟鍙栨秷澶辫触鐨勬儏鍐�
- if (redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId) == null) {
- logger.info("[鐐规挱瓒呮椂] 鏀舵祦瓒呮椂 deviceId: {}, channelId: {}锛岀鍙ｏ細{}, SSRC: {}", device.getDeviceId(), channelId, ssrcInfo.getPort(), ssrcInfo.getSsrc());
+ InviteInfo inviteInfoForTimeOut = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId);
+ if (inviteInfoForTimeOut == null || inviteInfoForTimeOut.getStreamInfo() == null) {
+ logger.info("[鐐规挱瓒呮椂] 鏀舵祦瓒呮椂 deviceId: {}, channelId: {},鐮佹祦绫诲瀷锛歿}锛岀鍙ｏ細{}, SSRC: {}",
+ device.getDeviceId(), channelId, device.isSwitchPrimarySubStream() ? "杈呯爜娴�" : "涓荤爜娴�",
+ ssrcInfo.getPort(), ssrcInfo.getSsrc());
+
// 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+// InviteInfo inviteInfoForTimeout = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.play, device.getDeviceId(), channelId);
+// if (inviteInfoForTimeout == null) {
+// return;
+// }
+// if (InviteSessionStatus.ok == inviteInfoForTimeout.getStatus() ) {
+// // TODO 鍙戦�乥ye
+// }else {
+// // TODO 鍙戦�乧ancel
+// }
+ callback.run(InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getCode(), InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getCode(), InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getMsg(), null);
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId);
+
try {
cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null);
- } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ } catch (InvalidArgumentException | ParseException | SipException |
+ SsrcTransactionNotFoundException e) {
logger.error("[鐐规挱瓒呮椂]锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
} finally {
- timeoutCallback.run(1, "鏀舵祦瓒呮椂");
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
@@ -457,37 +423,32 @@
}
}
}, userSetting.getPlayTimeout());
- //绔彛鑾峰彇澶辫触鐨剆srcInfo 娌℃湁蹇呰鍙戦�佺偣鎾寚浠�
- if (ssrcInfo.getPort() <= 0) {
- logger.info("[鐐规挱绔彛鍒嗛厤寮傚父]锛宒eviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
- dynamicTask.stop(timeOutTaskKey);
- // 閲婃斁ssrc
- mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
- streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + device.getDeviceId() + channelId);
- msg.setData(WVPResult.fail(ErrorCode.ERROR100.getCode(), "鐐规挱绔彛鍒嗛厤寮傚父"));
- resultHolder.invokeAllResult(msg);
- return;
- }
try {
- cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInuse, hookParam ) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + hookParam);
dynamicTask.stop(timeOutTaskKey);
-
// hook鍝嶅簲
- onPublishHandlerForPlay(mediaServerItemInuse, response, device.getDeviceId(), channelId);
- hookEvent.response(mediaServerItemInuse, response);
- logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
- String streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.flv", mediaServerItemInuse.getHttpPort(), "rtp", ssrcInfo.getStream());
- String path = "snap";
- String fileName = device.getDeviceId() + "_" + channelId + ".jpg";
- // 璇锋眰鎴浘
- logger.info("[璇锋眰鎴浘]: " + fileName);
- zlmresTfulUtils.getSnap(mediaServerItemInuse, streamUrl, 15, 1, path, fileName);
-
+ StreamInfo streamInfo = onPublishHandlerForPlay(mediaServerItemInuse, hookParam, device.getDeviceId(), channelId);
+ if (streamInfo == null){
+ callback.run(InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
+ return;
+ }
+ callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.SUCCESS.getCode(),
+ InviteErrorCode.SUCCESS.getMsg(),
+ streamInfo);
+ logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId:{}, 鐮佹祦绫诲瀷锛歿}", device.getDeviceId(),
+ device.isSwitchPrimarySubStream() ? "杈呯爜娴�" : "涓荤爜娴�");
+ snapOnPlay(mediaServerItemInuse, device.getDeviceId(), channelId, ssrcInfo.getStream());
}, (event) -> {
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+
ResponseEvent responseEvent = (ResponseEvent) event.event;
String contentString = new String(responseEvent.getResponse().getRawContent());
// 鑾峰彇ssrc
@@ -495,47 +456,118 @@
// 妫�鏌ユ槸鍚︽湁y瀛楁
if (ssrcIndex >= 0) {
//ssrc瑙勫畾闀垮害涓�10瀛楄妭锛屼笉鍙栦綑涓嬮暱搴︿互閬垮厤鍚庣画杩樻湁鈥渇=鈥濆瓧娈� TODO 鍚庣画瀵逛笉瑙勮寖鐨勯潪10浣峴src鍏煎
- String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
+ String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12).trim();
// 鏌ヨ鍒皊src涓嶄竴鑷翠笖寮�鍚簡ssrc鏍￠獙鍒欓渶瑕侀拡瀵瑰鐞�
if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
+ if (device.getStreamMode().equalsIgnoreCase("TCP-ACTIVE")) {
+ String substring = contentString.substring(0, contentString.indexOf("y="));
+ try {
+ SessionDescription sdp = SdpFactory.getInstance().createSessionDescription(substring);
+ int port = -1;
+ Vector mediaDescriptions = sdp.getMediaDescriptions(true);
+ for (Object description : mediaDescriptions) {
+ MediaDescription mediaDescription = (MediaDescription) description;
+ Media media = mediaDescription.getMedia();
+
+ Vector mediaFormats = media.getMediaFormats(false);
+ if (mediaFormats.contains("96")) {
+ port = media.getMediaPort();
+ break;
+ }
+ }
+ logger.info("[鐐规挱-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 杩炴帴瀵规柟鐨勫湴鍧�锛歿}:{}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, sdp.getConnection().getAddress(), port, device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ JSONObject jsonObject = zlmresTfulUtils.connectRtpServer(mediaServerItem, sdp.getConnection().getAddress(), port, ssrcInfo.getStream());
+ logger.info("[鐐规挱-TCP涓诲姩杩炴帴瀵规柟] 缁撴灉锛� {}", jsonObject);
+ } catch (SdpException e) {
+ logger.error("[鐐规挱-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 瑙ｆ瀽200OK鐨凷DP淇℃伅澶辫触", device.getDeviceId(), channelId, e);
+ dynamicTask.stop(timeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ }
+ }
return;
}
logger.info("[鐐规挱娑堟伅] 鏀跺埌invite 200, 鍙戠幇涓嬬骇鑷畾涔変簡ssrc: {}", ssrcInResponse);
if (!mediaServerItem.isRtpEnable() || device.isSsrcCheck()) {
logger.info("[鐐规挱娑堟伅] SSRC淇 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
-
- if (!mediaServerItem.getSsrcConfig().checkSsrc(ssrcInResponse)) {
- // ssrc 涓嶅彲鐢�
- // 閲婃斁ssrc
- mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
- streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- event.msg = "涓嬬骇鑷畾涔変簡ssrc,浣嗘槸姝src涓嶅彲鐢�";
- event.statusCode = 400;
- errorEvent.response(event);
- return;
- }
-
- // 鍗曠鍙ｆā寮弒treamId涔熸湁鍙樺寲锛岄渶瑕侀噸鏂拌缃洃鍚�
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ // 鍗曠鍙ｆā寮弒treamId涔熸湁鍙樺寲锛岄噸鏂拌缃洃鍚嵆鍙�
if (!mediaServerItem.isRtpEnable()) {
// 娣诲姞璁㈤槄
HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
subscribe.removeSubscribe(hookSubscribe);
- hookSubscribe.getContent().put("stream", String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase());
- subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject response) -> {
- logger.info("[ZLM HOOK] ssrc淇鍚庢敹鍒拌闃呮秷鎭細 " + response.toJSONString());
+ String stream = String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase();
+ hookSubscribe.getContent().put("stream", stream);
+ inviteStreamService.updateInviteInfoForStream(inviteInfo, stream);
+ subscribe.addSubscribe(hookSubscribe, (mediaServerItemInUse, hookParam) -> {
+ logger.info("[ZLM HOOK] ssrc淇鍚庢敹鍒拌闃呮秷鎭細 " + hookParam);
dynamicTask.stop(timeOutTaskKey);
// hook鍝嶅簲
- onPublishHandlerForPlay(mediaServerItemInUse, response, device.getDeviceId(), channelId);
- hookEvent.response(mediaServerItemInUse, response);
+ StreamInfo streamInfo = onPublishHandlerForPlay(mediaServerItemInUse, hookParam, device.getDeviceId(), channelId);
+ if (streamInfo == null){
+ callback.run(InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
+ return;
+ }
+ callback.run(InviteErrorCode.SUCCESS.getCode(),
+ InviteErrorCode.SUCCESS.getMsg(), streamInfo);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.SUCCESS.getCode(),
+ InviteErrorCode.SUCCESS.getMsg(),
+ streamInfo);
+ snapOnPlay(mediaServerItemInUse, device.getDeviceId(), channelId, stream);
});
+ return;
}
- // 鍏抽棴rtp server
- mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
- // 閲嶆柊寮�鍚痵src server
- mediaServerService.openRTPServer(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse, device.isSsrcCheck(), false, ssrcInfo.getPort());
+ // 鏇存柊ssrc
+ Boolean result = mediaServerService.updateRtpServerSSRC(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse);
+ if (!result) {
+ try {
+ logger.warn("[鐐规挱] 鏇存柊ssrc澶辫触锛屽仠姝㈢偣鎾� {}/{}", device.getDeviceId(), channelId);
+ cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null, null);
+ } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
+ }
+
+ dynamicTask.stop(timeOutTaskKey);
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_RESET_SSRC.getCode(),
+ "涓嬬骇鑷畾涔変簡ssrc,閲嶆柊璁剧疆鏀舵祦淇℃伅澶辫触", null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_RESET_SSRC.getCode(),
+ "涓嬬骇鑷畾涔変簡ssrc,閲嶆柊璁剧疆鏀舵祦淇℃伅澶辫触", null);
+
+ }else {
+ if (ssrcInfo.getStream()!= null && !ssrcInfo.getStream().equals(inviteInfo.getStream())) {
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ }
+ ssrcInfo.setSsrc(ssrcInResponse);
+ inviteInfo.setSsrcInfo(ssrcInfo);
+ inviteInfo.setStream(ssrcInfo.getStream());
+ }
+ }else {
+ logger.info("[鐐规挱娑堟伅] 鏀跺埌invite 200, 涓嬬骇鑷畾涔変簡ssrc, 浣嗘槸褰撳墠妯″紡鏃犻渶淇");
}
}
+ inviteStreamService.updateInviteInfo(inviteInfo);
}, (event) -> {
dynamicTask.stop(timeOutTaskKey);
mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
@@ -543,7 +575,14 @@
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- errorEvent.response(event);
+
+ callback.run(InviteErrorCode.ERROR_FOR_SIGNALLING_ERROR.getCode(),
+ String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_RESET_SSRC.getCode(),
+ String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg), null);
+
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId);
});
} catch (InvalidArgumentException | SipException | ParseException e) {
@@ -554,63 +593,82 @@
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
- eventResult.msg = "鍛戒护鍙戦�佸け璐�";
- errorEvent.response(eventResult);
+
+ callback.run(InviteErrorCode.ERROR_FOR_SIP_SENDING_FAILED.getCode(),
+ InviteErrorCode.ERROR_FOR_SIP_SENDING_FAILED.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_SIP_SENDING_FAILED.getCode(),
+ InviteErrorCode.ERROR_FOR_SIP_SENDING_FAILED.getMsg(), null);
+
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channelId);
}
}
- @Override
- public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject response, String deviceId, String channelId) {
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, response, deviceId, channelId);
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId);
+ /**
+ * 鐐规挱鎴愬姛鏃惰皟鐢ㄦ埅鍥�.
+ *
+ * @param mediaServerItemInuse media
+ * @param deviceId 璁惧 ID
+ * @param channelId 閫氶亾 ID
+ * @param stream ssrc
+ */
+ private void snapOnPlay(MediaServerItem mediaServerItemInuse, String deviceId, String channelId, String stream) {
+ String streamUrl;
+ if (mediaServerItemInuse.getRtspPort() != 0) {
+ streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInuse.getRtspPort(), "rtp", stream);
+ } else {
+ streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.mp4", mediaServerItemInuse.getHttpPort(), "rtp", stream);
+ }
+ String path = "snap";
+ String fileName = deviceId + "_" + channelId + ".jpg";
+ // 璇锋眰鎴浘
+ logger.info("[璇锋眰鎴浘]: " + fileName);
+ zlmresTfulUtils.getSnap(mediaServerItemInuse, streamUrl, 15, 1, path, fileName);
+ }
+
+ private StreamInfo onPublishHandlerForPlay(MediaServerItem mediaServerItem, HookParam hookParam, String deviceId, String channelId) {
+ StreamInfo streamInfo = null;
+ Device device = redisCatchStorage.getDevice(deviceId);
+ OnStreamChangedHookParam streamChangedHookParam = (OnStreamChangedHookParam)hookParam;
+ streamInfo = onPublishHandler(mediaServerItem, streamChangedHookParam, deviceId, channelId);
if (streamInfo != null) {
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
deviceChannel.setStreamId(streamInfo.getStream());
storager.startPlay(deviceId, channelId, streamInfo.getStream());
}
- redisCatchStorage.startPlay(streamInfo);
-
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(ErrorCode.SUCCESS.getCode());
- wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
- wvpResult.setData(streamInfo);
-
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
-
- } else {
- logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
- msg.setData(WVPResult.fail(ErrorCode.ERROR100.getCode(), "璁惧棰勮API璋冪敤澶辫触锛�"));
- resultHolder.invokeAllResult(msg);
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+ if (inviteInfo != null) {
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+ inviteInfo.setStreamInfo(streamInfo);
+ inviteStreamService.updateInviteInfo(inviteInfo);
+ }
}
+ return streamInfo;
+
}
- private void onPublishHandlerForPlayback(MediaServerItem mediaServerItem, JSONObject response, String deviceId, String channelId, PlayBackCallback playBackCallback) {
-
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, response, deviceId, channelId);
- PlayBackResult<StreamInfo> playBackResult = new PlayBackResult<>();
+ private StreamInfo onPublishHandlerForPlayback(MediaServerItem mediaServerItem, HookParam param, String deviceId, String channelId, String startTime, String endTime) {
+ OnStreamChangedHookParam streamChangedHookParam = (OnStreamChangedHookParam) param;
+ StreamInfo streamInfo = onPublishHandler(mediaServerItem, streamChangedHookParam, deviceId, channelId);
if (streamInfo != null) {
+ streamInfo.setStartTime(startTime);
+ streamInfo.setEndTime(endTime);
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
deviceChannel.setStreamId(streamInfo.getStream());
storager.startPlay(deviceId, channelId, streamInfo.getStream());
}
- redisCatchStorage.startPlay(streamInfo);
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAYBACK, deviceId, channelId);
+ if (inviteInfo != null) {
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+ inviteInfo.setStreamInfo(streamInfo);
+ inviteStreamService.updateInviteInfo(inviteInfo);
+ }
- playBackResult.setCode(ErrorCode.SUCCESS.getCode());
- playBackResult.setMsg(ErrorCode.SUCCESS.getMsg());
- playBackResult.setData(streamInfo);
- playBackCallback.call(playBackResult);
- } else {
- logger.warn("褰曞儚鍥炴斁璋冪敤澶辫触锛�");
- playBackResult.setCode(ErrorCode.ERROR100.getCode());
- playBackResult.setMsg("褰曞儚鍥炴斁璋冪敤澶辫触锛�");
- playBackCallback.call(playBackResult);
}
+ return streamInfo;
}
@Override
@@ -649,24 +707,24 @@
@Override
public void playBack(String deviceId, String channelId, String startTime,
- String endTime, InviteStreamCallback inviteStreamCallback,
- PlayBackCallback callback) {
+ String endTime, ErrorCallback<Object> callback) {
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
return;
}
MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, device.isSsrcCheck(), true);
-
- playBack(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, inviteStreamCallback, callback);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, null, device.isSsrcCheck(), true, 0, false,false, device.getStreamModeForParam());
+ playBack(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, callback);
}
@Override
public void playBack(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,
String deviceId, String channelId, String startTime,
- String endTime, InviteStreamCallback infoCallBack,
- PlayBackCallback playBackCallback) {
+ String endTime, ErrorCallback<Object> callback) {
if (mediaServerItem == null || ssrcInfo == null) {
+ callback.run(InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getCode(),
+ InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getMsg(),
+ null);
return;
}
@@ -674,160 +732,222 @@
if (device == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧锛� " + deviceId + "涓嶅瓨鍦�");
}
-
- PlayBackResult<StreamInfo> playBackResult = new PlayBackResult<>();
+ logger.info("[褰曞儚鍥炴斁] deviceId: {}, channelId: {}, 寮�濮嬫椂闂�: {}, 缁撴潫鏃堕棿锛� {}, 鏀舵祦绔彛锛歿}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}",
+ device.getDeviceId(), channelId, startTime, endTime, ssrcInfo.getPort(), device.getStreamMode(),
+ ssrcInfo.getSsrc(), device.isSsrcCheck());
+ // 鍒濆鍖杛edis涓殑invite娑堟伅鐘舵��
+ InviteInfo inviteInfo = InviteInfo.getInviteInfo(device.getDeviceId(), channelId, ssrcInfo.getStream(), ssrcInfo,
+ mediaServerItem.getSdpIp(), ssrcInfo.getPort(), device.getStreamMode(), InviteSessionType.PLAYBACK,
+ InviteSessionStatus.ready);
+ inviteStreamService.updateInviteInfo(inviteInfo);
String playBackTimeOutTaskKey = UUID.randomUUID().toString();
dynamicTask.startDelay(playBackTimeOutTaskKey, () -> {
- logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
- playBackResult.setCode(ErrorCode.ERROR100.getCode());
- playBackResult.setMsg("鍥炴斁瓒呮椂");
+ logger.warn("[褰曞儚鍥炴斁] 瓒呮椂锛宒eviceId锛歿} 锛宑hannelId锛歿}", deviceId, channelId);
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ callback.run(InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getCode(), InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getMsg(), null);
try {
cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null);
} catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[褰曞儚娴乚鍥炴斁瓒呮椂 鍙戦�丅YE澶辫触 {}", e.getMessage());
+ logger.error("[褰曞儚鍥炴斁] 瓒呮椂 鍙戦�丅YE澶辫触 {}", e.getMessage());
} catch (SsrcTransactionNotFoundException e) {
// 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
streamSession.remove(deviceId, channelId, ssrcInfo.getStream());
}
- // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
- playBackCallback.call(playBackResult);
}, userSetting.getPlayTimeout());
SipSubscribe.Event errorEvent = event -> {
+ logger.info("[褰曞儚鍥炴斁] 澶辫触锛寋} {}", event.statusCode, event.msg);
dynamicTask.stop(playBackTimeOutTaskKey);
- playBackResult.setCode(ErrorCode.ERROR100.getCode());
- playBackResult.setMsg(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- playBackResult.setEvent(event);
- playBackCallback.call(playBackResult);
+ callback.run(InviteErrorCode.ERROR_FOR_SIGNALLING_ERROR.getCode(),
+ String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg), null);
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+ inviteStreamService.removeInviteInfo(inviteInfo);
};
- InviteStreamCallback hookEvent = (InviteStreamInfo inviteStreamInfo) -> {
- logger.info("鏀跺埌鍥炴斁璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
+ ZlmHttpHookSubscribe.Event hookEvent = (mediaServerItemInuse, hookParam) -> {
+ logger.info("鏀跺埌鍥炴斁璁㈤槄娑堟伅锛� " + hookParam);
dynamicTask.stop(playBackTimeOutTaskKey);
- StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
+ StreamInfo streamInfo = onPublishHandlerForPlayback(mediaServerItemInuse, hookParam, deviceId, channelId, startTime, endTime);
if (streamInfo == null) {
logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- playBackResult.setCode(ErrorCode.ERROR100.getCode());
- playBackResult.setMsg("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- playBackCallback.call(playBackResult);
+ callback.run(InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
return;
}
- redisCatchStorage.startPlayback(streamInfo, inviteStreamInfo.getCallId());
- playBackResult.setCode(ErrorCode.SUCCESS.getCode());
- playBackResult.setMsg(ErrorCode.SUCCESS.getMsg());
- playBackResult.setData(streamInfo);
- playBackResult.setMediaServerItem(inviteStreamInfo.getMediaServerItem());
- playBackResult.setResponse(inviteStreamInfo.getResponse());
- playBackCallback.call(playBackResult);
+ callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
+ logger.info("[褰曞儚鍥炴斁] 鎴愬姛 deviceId: {}, channelId: {}, 寮�濮嬫椂闂�: {}, 缁撴潫鏃堕棿锛� {}", device.getDeviceId(), channelId, startTime, endTime);
};
try {
- cmder.playbackStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, infoCallBack,
+ cmder.playbackStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime,
hookEvent, eventResult -> {
- if (eventResult.type == SipSubscribe.EventResultType.response) {
- ResponseEvent responseEvent = (ResponseEvent) eventResult.event;
- String contentString = new String(responseEvent.getResponse().getRawContent());
- // 鑾峰彇ssrc
- int ssrcIndex = contentString.indexOf("y=");
- // 妫�鏌ユ槸鍚︽湁y瀛楁
- if (ssrcIndex >= 0) {
- //ssrc瑙勫畾闀垮害涓�10瀛楄妭锛屼笉鍙栦綑涓嬮暱搴︿互閬垮厤鍚庣画杩樻湁鈥渇=鈥濆瓧娈� TODO 鍚庣画瀵逛笉瑙勮寖鐨勯潪10浣峴src鍏煎
- String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
- // 鏌ヨ鍒皊src涓嶄竴鑷翠笖寮�鍚簡ssrc鏍￠獙鍒欓渶瑕侀拡瀵瑰鐞�
- if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
- return;
- }
- logger.info("[鍥炴斁娑堟伅] 鏀跺埌invite 200, 鍙戠幇涓嬬骇鑷畾涔変簡ssrc: {}", ssrcInResponse);
- if (!mediaServerItem.isRtpEnable() || device.isSsrcCheck()) {
- logger.info("[鍥炴斁娑堟伅] SSRC淇 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+ ResponseEvent responseEvent = (ResponseEvent) eventResult.event;
+ String contentString = new String(responseEvent.getResponse().getRawContent());
+ // 鑾峰彇ssrc
+ int ssrcIndex = contentString.indexOf("y=");
+ // 妫�鏌ユ槸鍚︽湁y瀛楁
+ if (ssrcIndex >= 0) {
+ //ssrc瑙勫畾闀垮害涓�10瀛楄妭锛屼笉鍙栦綑涓嬮暱搴︿互閬垮厤鍚庣画杩樻湁鈥渇=鈥濆瓧娈� TODO 鍚庣画瀵逛笉瑙勮寖鐨勯潪10浣峴src鍏煎
+ String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
+ // 鏌ヨ鍒皊src涓嶄竴鑷翠笖寮�鍚簡ssrc鏍￠獙鍒欓渶瑕侀拡瀵瑰鐞�
+ if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
+ if (device.getStreamMode().equalsIgnoreCase("TCP-ACTIVE")) {
+ String substring = contentString.substring(0, contentString.indexOf("y="));
+ try {
+ SessionDescription sdp = SdpFactory.getInstance().createSessionDescription(substring);
+ int port = -1;
+ Vector mediaDescriptions = sdp.getMediaDescriptions(true);
+ for (Object description : mediaDescriptions) {
+ MediaDescription mediaDescription = (MediaDescription) description;
+ Media media = mediaDescription.getMedia();
- if (!mediaServerItem.getSsrcConfig().checkSsrc(ssrcInResponse)) {
- // ssrc 涓嶅彲鐢�
+ Vector mediaFormats = media.getMediaFormats(false);
+ if (mediaFormats.contains("96")) {
+ port = media.getMediaPort();
+ break;
+ }
+ }
+ logger.info("[褰曞儚鍥炴斁-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 杩炴帴瀵规柟鐨勫湴鍧�锛歿}:{}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, sdp.getConnection().getAddress(), port, device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ JSONObject jsonObject = zlmresTfulUtils.connectRtpServer(mediaServerItem, sdp.getConnection().getAddress(), port, ssrcInfo.getStream());
+ logger.info("[褰曞儚鍥炴斁-TCP涓诲姩杩炴帴瀵规柟] 缁撴灉锛� {}", jsonObject);
+ } catch (SdpException e) {
+ logger.error("[褰曞儚鍥炴斁-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 瑙ｆ瀽200OK鐨凷DP淇℃伅澶辫触", device.getDeviceId(), channelId, e);
+ dynamicTask.stop(playBackTimeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
// 閲婃斁ssrc
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- eventResult.msg = "涓嬬骇鑷畾涔変簡ssrc,浣嗘槸姝src涓嶅彲鐢�";
- eventResult.statusCode = 400;
- errorEvent.response(eventResult);
- return;
+
+ callback.run(InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ }
+ }
+ return;
+ }
+ logger.info("[褰曞儚鍥炴斁] 鏀跺埌invite 200, 鍙戠幇涓嬬骇鑷畾涔変簡ssrc: {}", ssrcInResponse);
+ if (!mediaServerItem.isRtpEnable() || device.isSsrcCheck()) {
+ logger.info("[褰曞儚鍥炴斁] SSRC淇 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
+
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ // 鍗曠鍙ｆā寮弒treamId涔熸湁鍙樺寲锛岄渶瑕侀噸鏂拌缃洃鍚�
+ if (!mediaServerItem.isRtpEnable()) {
+ // 娣诲姞璁㈤槄
+ HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
+ subscribe.removeSubscribe(hookSubscribe);
+ String stream = String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase();
+ hookSubscribe.getContent().put("stream", stream);
+ inviteStreamService.updateInviteInfoForStream(inviteInfo, stream);
+ subscribe.addSubscribe(hookSubscribe, (mediaServerItemInUse, hookParam) -> {
+ logger.info("[ZLM HOOK] ssrc淇鍚庢敹鍒拌闃呮秷鎭細 " + hookParam);
+ dynamicTask.stop(playBackTimeOutTaskKey);
+ // hook鍝嶅簲
+ hookEvent.response(mediaServerItemInUse, hookParam);
+ });
+ }
+ // 鏇存柊ssrc
+ Boolean result = mediaServerService.updateRtpServerSSRC(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse);
+ if (!result) {
+ try {
+ logger.warn("[褰曞儚鍥炴斁] 鏇存柊ssrc澶辫触锛屽仠姝㈠綍鍍忓洖鏀� {}/{}", device.getDeviceId(), channelId);
+ cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null, null);
+ } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
+
}
- // 鍗曠鍙ｆā寮弒treamId涔熸湁鍙樺寲锛岄渶瑕侀噸鏂拌缃洃鍚�
- if (!mediaServerItem.isRtpEnable()) {
- // 娣诲姞璁㈤槄
- HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
- subscribe.removeSubscribe(hookSubscribe);
- hookSubscribe.getContent().put("stream", String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase());
- subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject response) -> {
- logger.info("[ZLM HOOK] ssrc淇鍚庢敹鍒拌闃呮秷鎭細 " + response.toJSONString());
- dynamicTask.stop(playBackTimeOutTaskKey);
- // hook鍝嶅簲
- onPublishHandlerForPlayback(mediaServerItemInUse, response, device.getDeviceId(), channelId, playBackCallback);
- hookEvent.call(new InviteStreamInfo(mediaServerItem, null, eventResult.callId, "rtp", ssrcInfo.getStream()));
- });
+ dynamicTask.stop(playBackTimeOutTaskKey);
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_RESET_SSRC.getCode(),
+ "涓嬬骇鑷畾涔変簡ssrc,閲嶆柊璁剧疆鏀舵祦淇℃伅澶辫触", null);
+
+ }else {
+ if (ssrcInfo.getStream()!= null && !ssrcInfo.getStream().equals(inviteInfo.getStream())) {
+ inviteStreamService.removeInviteInfo(inviteInfo);
}
- // 鍏抽棴rtp server
- mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
- // 閲嶆柊寮�鍚痵src server
- mediaServerService.openRTPServer(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse, device.isSsrcCheck(), true, ssrcInfo.getPort());
+
+ ssrcInfo.setSsrc(ssrcInResponse);
+ inviteInfo.setSsrcInfo(ssrcInfo);
+ inviteInfo.setStream(ssrcInfo.getStream());
}
+ }else {
+ logger.info("[鐐规挱娑堟伅] 鏀跺埌invite 200, 涓嬬骇鑷畾涔変簡ssrc, 浣嗘槸褰撳墠妯″紡鏃犻渶淇");
}
}
-
+ inviteStreamService.updateInviteInfo(inviteInfo);
}, errorEvent);
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 鍥炴斁: {}", e.getMessage());
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+ eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+ eventResult.statusCode = -1;
eventResult.msg = "鍛戒护鍙戦�佸け璐�";
errorEvent.response(eventResult);
}
}
-
@Override
- public void download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback playBackCallback) {
+ public void download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, ErrorCallback<Object> callback) {
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
return;
}
MediaServerItem newMediaServerItem = getNewMediaServerItemHasAssist(device);
if (newMediaServerItem == null) {
- PlayBackResult<StreamInfo> downloadResult = new PlayBackResult<>();
- downloadResult.setCode(ErrorCode.ERROR100.getCode());
- downloadResult.setMsg("鏈壘鍒癮ssist鏈嶅姟");
- playBackCallback.call(downloadResult);
+ callback.run(InviteErrorCode.ERROR_FOR_ASSIST_NOT_READY.getCode(),
+ InviteErrorCode.ERROR_FOR_ASSIST_NOT_READY.getMsg(),
+ null);
return;
}
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, device.isSsrcCheck(), true);
-
- download(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, downloadSpeed, infoCallBack, playBackCallback);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, null, device.isSsrcCheck(), true, 0, false,false, device.getStreamModeForParam());
+ download(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, downloadSpeed, callback);
}
@Override
- public void download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack) {
+ public void download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, ErrorCallback<Object> callback) {
if (mediaServerItem == null || ssrcInfo == null) {
+ callback.run(InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getCode(),
+ InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getMsg(),
+ null);
return;
}
-
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
- throw new ControllerException(ErrorCode.ERROR400.getCode(), "璁惧锛�" + deviceId + "涓嶅瓨鍦�");
+ callback.run(InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getCode(),
+ "璁惧锛�" + deviceId + "涓嶅瓨鍦�",
+ null);
+ return;
}
- PlayBackResult<StreamInfo> downloadResult = new PlayBackResult<>();
-
+ logger.info("[褰曞儚涓嬭浇] deviceId: {}, channelId: {}, 涓嬭浇閫熷害锛歿}, 鏀舵祦绔彛锛歿}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, downloadSpeed, ssrcInfo.getPort(), device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ // 鍒濆鍖杛edis涓殑invite娑堟伅鐘舵��
+ InviteInfo inviteInfo = InviteInfo.getInviteInfo(device.getDeviceId(), channelId, ssrcInfo.getStream(), ssrcInfo,
+ mediaServerItem.getSdpIp(), ssrcInfo.getPort(), device.getStreamMode(), InviteSessionType.DOWNLOAD,
+ InviteSessionStatus.ready);
+ inviteStreamService.updateInviteInfo(inviteInfo);
String downLoadTimeOutTaskKey = UUID.randomUUID().toString();
dynamicTask.startDelay(downLoadTimeOutTaskKey, () -> {
logger.warn(String.format("褰曞儚涓嬭浇璇锋眰瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
- downloadResult.setCode(ErrorCode.ERROR100.getCode());
- downloadResult.setMsg("褰曞儚涓嬭浇璇锋眰瓒呮椂");
- hookCallBack.call(downloadResult);
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ callback.run(InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getCode(),
+ InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getMsg(), null);
// 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
try {
@@ -843,33 +963,136 @@
SipSubscribe.Event errorEvent = event -> {
dynamicTask.stop(downLoadTimeOutTaskKey);
- downloadResult.setCode(ErrorCode.ERROR100.getCode());
- downloadResult.setMsg(String.format("褰曞儚涓嬭浇澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- downloadResult.setEvent(event);
- hookCallBack.call(downloadResult);
+ callback.run(InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getCode(),
+ String.format("褰曞儚涓嬭浇澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg), null);
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+ inviteStreamService.removeInviteInfo(inviteInfo);
};
-
+ ZlmHttpHookSubscribe.Event hookEvent = (mediaServerItemInuse, hookParam) -> {
+ logger.info("[褰曞儚涓嬭浇]鏀跺埌璁㈤槄娑堟伅锛� " + hookParam);
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ StreamInfo streamInfo = onPublishHandlerForDownload(mediaServerItemInuse, hookParam, deviceId, channelId, startTime, endTime);
+ if (streamInfo == null) {
+ logger.warn("[褰曞儚涓嬭浇] 鑾峰彇娴佸湴鍧�淇℃伅澶辫触");
+ callback.run(InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_STREAM_PARSING_EXCEPTIONS.getMsg(), null);
+ return;
+ }
+ callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
+ logger.info("[褰曞儚涓嬭浇] 璋冪敤鎴愬姛 deviceId: {}, channelId: {}, 寮�濮嬫椂闂�: {}, 缁撴潫鏃堕棿锛� {}", device.getDeviceId(), channelId, startTime, endTime);
+ };
try {
- cmder.downloadStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, downloadSpeed, infoCallBack,
- inviteStreamInfo -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
- dynamicTask.stop(downLoadTimeOutTaskKey);
- StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
- streamInfo.setStartTime(startTime);
- streamInfo.setEndTime(endTime);
- redisCatchStorage.startDownload(streamInfo, inviteStreamInfo.getCallId());
- downloadResult.setCode(ErrorCode.SUCCESS.getCode());
- downloadResult.setMsg(ErrorCode.SUCCESS.getMsg());
- downloadResult.setData(streamInfo);
- downloadResult.setMediaServerItem(inviteStreamInfo.getMediaServerItem());
- downloadResult.setResponse(inviteStreamInfo.getResponse());
- hookCallBack.call(downloadResult);
- }, errorEvent);
+ cmder.downloadStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, downloadSpeed,
+ hookEvent, errorEvent, eventResult ->{
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+ ResponseEvent responseEvent = (ResponseEvent) eventResult.event;
+ String contentString = new String(responseEvent.getResponse().getRawContent());
+ // 鑾峰彇ssrc
+ int ssrcIndex = contentString.indexOf("y=");
+ // 妫�鏌ユ槸鍚︽湁y瀛楁
+ if (ssrcIndex >= 0) {
+ //ssrc瑙勫畾闀垮害涓�10瀛楄妭锛屼笉鍙栦綑涓嬮暱搴︿互閬垮厤鍚庣画杩樻湁鈥渇=鈥濆瓧娈� TODO 鍚庣画瀵逛笉瑙勮寖鐨勯潪10浣峴src鍏煎
+ String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
+ // 鏌ヨ鍒皊src涓嶄竴鑷翠笖寮�鍚簡ssrc鏍￠獙鍒欓渶瑕侀拡瀵瑰鐞�
+ if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
+ if (device.getStreamMode().equalsIgnoreCase("TCP-ACTIVE")) {
+ String substring = contentString.substring(0, contentString.indexOf("y="));
+ try {
+ SessionDescription sdp = SdpFactory.getInstance().createSessionDescription(substring);
+ int port = -1;
+ Vector mediaDescriptions = sdp.getMediaDescriptions(true);
+ for (Object description : mediaDescriptions) {
+ MediaDescription mediaDescription = (MediaDescription) description;
+ Media media = mediaDescription.getMedia();
+
+ Vector mediaFormats = media.getMediaFormats(false);
+ if (mediaFormats.contains("96")) {
+ port = media.getMediaPort();
+ break;
+ }
+ }
+ logger.info("[褰曞儚涓嬭浇-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 杩炴帴瀵规柟鐨勫湴鍧�锛歿}:{}, 鏀舵祦妯″紡锛歿}, SSRC: {}, SSRC鏍￠獙锛歿}", device.getDeviceId(), channelId, sdp.getConnection().getAddress(), port, device.getStreamMode(), ssrcInfo.getSsrc(), device.isSsrcCheck());
+ JSONObject jsonObject = zlmresTfulUtils.connectRtpServer(mediaServerItem, sdp.getConnection().getAddress(), port, ssrcInfo.getStream());
+ logger.info("[褰曞儚涓嬭浇-TCP涓诲姩杩炴帴瀵规柟] 缁撴灉锛� {}", jsonObject);
+ } catch (SdpException e) {
+ logger.error("[褰曞儚涓嬭浇-TCP涓诲姩杩炴帴瀵规柟] deviceId: {}, channelId: {}, 瑙ｆ瀽200OK鐨凷DP淇℃伅澶辫触", device.getDeviceId(), channelId, e);
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getCode(),
+ InviteErrorCode.ERROR_FOR_SDP_PARSING_EXCEPTIONS.getMsg(), null);
+ }
+ }
+ return;
+ }
+ logger.info("[褰曞儚涓嬭浇] 鏀跺埌invite 200, 鍙戠幇涓嬬骇鑷畾涔変簡ssrc: {}", ssrcInResponse);
+ if (!mediaServerItem.isRtpEnable() || device.isSsrcCheck()) {
+ logger.info("[褰曞儚涓嬭浇] SSRC淇 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
+
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ // 鍗曠鍙ｆā寮弒treamId涔熸湁鍙樺寲锛岄渶瑕侀噸鏂拌缃洃鍚�
+ if (!mediaServerItem.isRtpEnable()) {
+ // 娣诲姞璁㈤槄
+ HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
+ subscribe.removeSubscribe(hookSubscribe);
+ String stream = String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase();
+ hookSubscribe.getContent().put("stream", stream);
+ inviteStreamService.updateInviteInfoForStream(inviteInfo, stream);
+ subscribe.addSubscribe(hookSubscribe, (mediaServerItemInUse, hookParam) -> {
+ logger.info("[ZLM HOOK] ssrc淇鍚庢敹鍒拌闃呮秷鎭細 " + hookParam);
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ hookEvent.response(mediaServerItemInUse, hookParam);
+ });
+ }
+
+ // 鏇存柊ssrc
+ Boolean result = mediaServerService.updateRtpServerSSRC(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse);
+ if (!result) {
+ try {
+ logger.warn("[褰曞儚涓嬭浇] 鏇存柊ssrc澶辫触锛屽仠姝㈠綍鍍忓洖鏀� {}/{}", device.getDeviceId(), channelId);
+ cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null, null);
+ } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
+ }
+
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+
+ callback.run(InviteErrorCode.ERROR_FOR_RESET_SSRC.getCode(),
+ "涓嬬骇鑷畾涔変簡ssrc,閲嶆柊璁剧疆鏀舵祦淇℃伅澶辫触", null);
+
+ }else {
+ if (ssrcInfo.getStream()!= null && !ssrcInfo.getStream().equals(inviteInfo.getStream())) {
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ }
+ ssrcInfo.setSsrc(ssrcInResponse);
+ inviteInfo.setSsrcInfo(ssrcInfo);
+ inviteInfo.setStream(ssrcInfo.getStream());
+ }
+ }else {
+ logger.info("[褰曞儚涓嬭浇] 鏀跺埌invite 200, 涓嬬骇鑷畾涔変簡ssrc, 浣嗘槸褰撳墠妯″紡鏃犻渶淇");
+ }
+ }
+ inviteStreamService.updateInviteInfo(inviteInfo);
+ });
} catch (InvalidArgumentException | SipException | ParseException e) {
logger.error("[鍛戒护鍙戦�佸け璐 褰曞儚涓嬭浇: {}", e.getMessage());
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+ eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+ eventResult.statusCode = -1;
eventResult.msg = "鍛戒护鍙戦�佸け璐�";
errorEvent.response(eventResult);
}
@@ -877,21 +1100,22 @@
@Override
public StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream) {
- StreamInfo streamInfo = redisCatchStorage.queryDownload(deviceId, channelId, stream, null);
- if (streamInfo != null) {
- if (streamInfo.getProgress() == 1) {
- return streamInfo;
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfo(InviteSessionType.DOWNLOAD, deviceId, channelId, stream);
+
+ if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+ if (inviteInfo.getStreamInfo().getProgress() == 1) {
+ return inviteInfo.getStreamInfo();
}
// 鑾峰彇褰撳墠宸蹭笅杞芥椂闀�
- String mediaServerId = streamInfo.getMediaServerId();
+ String mediaServerId = inviteInfo.getStreamInfo().getMediaServerId();
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem == null) {
logger.warn("鏌ヨ褰曞儚淇℃伅鏃跺彂鐜拌妭鐐瑰凡绂荤嚎");
return null;
}
if (mediaServerItem.getRecordAssistPort() > 0) {
- JSONObject jsonObject = assistRESTfulUtils.fileDuration(mediaServerItem, streamInfo.getApp(), streamInfo.getStream(), null);
+ JSONObject jsonObject = assistRESTfulUtils.fileDuration(mediaServerItem, inviteInfo.getStreamInfo().getApp(), inviteInfo.getStreamInfo().getStream(), null);
if (jsonObject == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴Assist鏈嶅姟澶辫触");
}
@@ -899,10 +1123,10 @@
long duration = jsonObject.getLong("data");
if (duration == 0) {
- streamInfo.setProgress(0);
+ inviteInfo.getStreamInfo().setProgress(0);
} else {
- String startTime = streamInfo.getStartTime();
- String endTime = streamInfo.getEndTime();
+ String startTime = inviteInfo.getStreamInfo().getStartTime();
+ String endTime = inviteInfo.getStreamInfo().getEndTime();
long start = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
long end = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
@@ -910,40 +1134,42 @@
BigDecimal totalCount = new BigDecimal(end - start);
BigDecimal divide = currentCount.divide(totalCount, 2, RoundingMode.HALF_UP);
double process = divide.doubleValue();
- streamInfo.setProgress(process);
+ inviteInfo.getStreamInfo().setProgress(process);
}
+ inviteStreamService.updateInviteInfo(inviteInfo);
}
+ }
+ return inviteInfo.getStreamInfo();
+ }
+ return null;
+ }
+
+ private StreamInfo onPublishHandlerForDownload(MediaServerItem mediaServerItemInuse, HookParam hookParam, String deviceId, String channelId, String startTime, String endTime) {
+ OnStreamChangedHookParam streamChangedHookParam = (OnStreamChangedHookParam) hookParam;
+ StreamInfo streamInfo = onPublishHandler(mediaServerItemInuse, streamChangedHookParam, deviceId, channelId);
+ if (streamInfo != null) {
+ streamInfo.setProgress(0);
+ streamInfo.setStartTime(startTime);
+ streamInfo.setEndTime(endTime);
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfo(InviteSessionType.DOWNLOAD, deviceId, channelId, streamInfo.getStream());
+ if (inviteInfo != null) {
+ logger.info("[褰曞儚涓嬭浇] 鏇存柊invite娑堟伅涓殑stream淇℃伅");
+ inviteInfo.setStatus(InviteSessionStatus.ok);
+ inviteInfo.setStreamInfo(streamInfo);
+ inviteStreamService.updateInviteInfo(inviteInfo);
}
}
return streamInfo;
}
- @Override
- public void onPublishHandlerForDownload(InviteStreamInfo inviteStreamInfo, String deviceId, String channelId, String uuid) {
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_DOWNLOAD + deviceId + channelId);
- msg.setId(uuid);
- StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
- if (streamInfo != null) {
- redisCatchStorage.startDownload(streamInfo, inviteStreamInfo.getCallId());
- msg.setData(JSON.toJSONString(streamInfo));
- resultHolder.invokeResult(msg);
- } else {
- logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
- msg.setData(WVPResult.fail(ErrorCode.ERROR100.getCode(), "璁惧棰勮API璋冪敤澶辫触锛�"));
- resultHolder.invokeResult(msg);
- }
- }
-
- public StreamInfo onPublishHandler(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId) {
- String streamId = resonse.getString("stream");
- JSONArray tracks = resonse.getJSONArray("tracks");
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, "rtp", streamId, tracks, null);
+ public StreamInfo onPublishHandler(MediaServerItem mediaServerItem, OnStreamChangedHookParam hookParam, String deviceId, String channelId) {
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, "rtp", hookParam.getStream(), hookParam.getTracks(), null);
streamInfo.setDeviceID(deviceId);
streamInfo.setChannelId(channelId);
return streamInfo;
}
+
@Override
public void zlmServerOffline(String mediaServerId) {
@@ -974,7 +1200,7 @@
cmder.streamByeCmd(device, ssrcTransaction.getChannelId(),
ssrcTransaction.getStream(), null);
} catch (InvalidArgumentException | ParseException | SipException |
- SsrcTransactionNotFoundException e) {
+ SsrcTransactionNotFoundException e) {
logger.error("[zlm绂荤嚎]涓烘鍦ㄤ娇鐢ㄦzlm鐨勮澶囷紝 鍙戦�丅YE澶辫触 {}", e.getMessage());
}
}
@@ -983,7 +1209,8 @@
}
@Override
- public AudioBroadcastResult audioBroadcast(Device device, String channelId) {
+ public AudioBroadcastResult audioBroadcast(Device device, String channelId, Boolean broadcastMode) {
+ // TODO 蹇呴』澶氱鍙ｆā寮忔墠鏀寔璇煶鍠婅瘽楣よ闊冲璁�
if (device == null || channelId == null) {
return null;
}
@@ -993,53 +1220,64 @@
logger.warn("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾锛� {}", channelId);
return null;
}
- MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad();
- String app = "broadcast";
- // TODO 浠巗ip user agent涓垽鏂槸浠�涔堝搧鐗岃澶囷紝澶у崕榛樿浣跨敤talk妯″紡锛屽叾浠栦娇鐢╞roadcast妯″紡
-// String app = "talk";
+ MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad(null);
+ if (broadcastMode == null) {
+ broadcastMode = true;
+ }
+ String app = broadcastMode?"broadcast":"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.setStreamInfo(new StreamContent(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 {
+ public boolean audioBroadcastCmd(Device device, String channelId, MediaServerItem mediaServerItem, String app, String stream, int timeout, boolean isFromPlatform, AudioBroadcastEvent event) throws InvalidArgumentException, ParseException, SipException {
if (device == null || channelId == null) {
- return;
+ return false;
}
logger.info("[璇煶鍠婅瘽] device锛� {}, channel: {}", device.getDeviceId(), channelId);
DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);
if (deviceChannel == null) {
logger.warn("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾锛� {}", channelId);
event.call("寮�鍚闊冲箍鎾殑鏃跺�欐湭鎵惧埌閫氶亾");
- return;
+ return false;
}
// 鏌ヨ閫氶亾浣跨敤鐘舵��
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());
+ Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStream());
if (streamReady) {
logger.warn("璇煶骞挎挱宸茬粡寮�鍚細 {}", channelId);
event.call("璇煶骞挎挱宸茬粡寮�鍚�");
- return;
+ return false;
} else {
stopAudioBroadcast(device.getDeviceId(), channelId);
}
+ }
+ }
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
+ if (sendRtpItem != null) {
+ MediaServerItem mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, "rtp", sendRtpItem.getReceiveStream());
+ if (streamReady) {
+ logger.warn("[璇煶瀵硅] 杩涜涓細 {}", channelId);
+ event.call("璇煶瀵硅杩涜涓�");
+ return false;
+ } else {
+ stopTalk(device, channelId);
}
}
// 鍙戦�侀�氱煡
cmder.audioBroadcastCmd(device, channelId, eventResultForOk -> {
// 鍙戦�佹垚鍔�
- AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, AudioBroadcastCatchStatus.Ready);
+ AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, mediaServerItem, app, stream, event, AudioBroadcastCatchStatus.Ready, isFromPlatform);
audioBroadcastManager.update(audioBroadcastCatch);
}, eventResultForError -> {
// 鍙戦�佸け璐�
@@ -1047,22 +1285,40 @@
event.call("璇煶骞挎挱鍙戦�佸け璐�");
stopAudioBroadcast(device.getDeviceId(), channelId);
});
+ return true;
}
+ @Override
+ public boolean audioBroadcastInUse(Device device, String channelId) {
+ if (audioBroadcastManager.exit(device.getDeviceId(), channelId)) {
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
+ if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
+ // 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
+ MediaServerItem mediaServerServiceOne = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerServiceOne, sendRtpItem.getApp(), sendRtpItem.getStream());
+ if (streamReady) {
+ logger.warn("璇煶骞挎挱閫氶亾浣跨敤涓細 {}", channelId);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
@Override
public void stopAudioBroadcast(String deviceId, String channelId) {
+ logger.info("[鍋滄瀵硅] 璁惧锛歿}, 閫氶亾锛歿}", deviceId, channelId);
List<AudioBroadcastCatch> audioBroadcastCatchList = new ArrayList<>();
if (channelId == null) {
audioBroadcastCatchList.addAll(audioBroadcastManager.get(deviceId));
- }else {
+ } else {
audioBroadcastCatchList.add(audioBroadcastManager.get(deviceId, channelId));
}
if (audioBroadcastCatchList.size() > 0) {
for (AudioBroadcastCatch audioBroadcastCatch : audioBroadcastCatchList) {
Device device = deviceService.getDevice(deviceId);
- if (device == null || audioBroadcastCatch == null ) {
+ if (device == null || audioBroadcastCatch == null) {
return;
}
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(deviceId, audioBroadcastCatch.getChannelId(), null, null);
@@ -1072,7 +1328,7 @@
Map<String, Object> param = new HashMap<>();
param.put("vhost", "__defaultVhost__");
param.put("app", sendRtpItem.getApp());
- param.put("stream", sendRtpItem.getStreamId());
+ param.put("stream", sendRtpItem.getStream());
zlmresTfulUtils.stopSendRtp(mediaInfo, param);
try {
cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
@@ -1086,6 +1342,7 @@
}
}
}
+
@Override
public void zlmServerOnline(String mediaServerId) {
@@ -1141,15 +1398,14 @@
@Override
public void pauseRtp(String streamId) throws ServiceException, InvalidArgumentException, ParseException, SipException {
- String key = redisCatchStorage.queryPlaybackForKey(null, null, streamId, null);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, streamId);
+ if (null == inviteInfo || inviteInfo.getStreamInfo() == null) {
logger.warn("streamId涓嶅瓨鍦�!");
throw new ServiceException("streamId涓嶅瓨鍦�");
}
- streamInfo.setPause(true);
- RedisUtil.set(key, streamInfo);
- MediaServerItem mediaServerItem = mediaServerService.getOne(streamInfo.getMediaServerId());
+ inviteInfo.getStreamInfo().setPause(true);
+ inviteStreamService.updateInviteInfo(inviteInfo);
+ MediaServerItem mediaServerItem = mediaServerService.getOne(inviteInfo.getStreamInfo().getMediaServerId());
if (null == mediaServerItem) {
logger.warn("mediaServer 涓嶅瓨鍦�!");
throw new ServiceException("mediaServer涓嶅瓨鍦�");
@@ -1159,21 +1415,20 @@
if (jsonObject == null || jsonObject.getInteger("code") != 0) {
throw new ServiceException("鏆傚仠RTP鎺ユ敹澶辫触");
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playPauseCmd(device, streamInfo);
+ Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());
+ cmder.playPauseCmd(device, inviteInfo.getStreamInfo());
}
@Override
public void resumeRtp(String streamId) throws ServiceException, InvalidArgumentException, ParseException, SipException {
- String key = redisCatchStorage.queryPlaybackForKey(null, null, streamId, null);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, streamId);
+ if (null == inviteInfo || inviteInfo.getStreamInfo() == null) {
logger.warn("streamId涓嶅瓨鍦�!");
throw new ServiceException("streamId涓嶅瓨鍦�");
}
- streamInfo.setPause(false);
- RedisUtil.set(key, streamInfo);
- MediaServerItem mediaServerItem = mediaServerService.getOne(streamInfo.getMediaServerId());
+ inviteInfo.getStreamInfo().setPause(false);
+ inviteStreamService.updateInviteInfo(inviteInfo);
+ MediaServerItem mediaServerItem = mediaServerService.getOne(inviteInfo.getStreamInfo().getMediaServerId());
if (null == mediaServerItem) {
logger.warn("mediaServer 涓嶅瓨鍦�!");
throw new ServiceException("mediaServer涓嶅瓨鍦�");
@@ -1183,25 +1438,21 @@
if (jsonObject == null || jsonObject.getInteger("code") != 0) {
throw new ServiceException("缁х画RTP鎺ユ敹澶辫触");
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playResumeCmd(device, streamInfo);
+ Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());
+ cmder.playResumeCmd(device, inviteInfo.getStreamInfo());
}
@Override
public void startPushStream(SendRtpItem sendRtpItem, SIPResponse sipResponse, ParentPlatform platform, CallIdHeader callIdHeader) {
-
// 寮�濮嬪彂娴�
- // 鍙栨秷璁剧疆鐨勮秴鏃朵换鍔�
-// String channelId = request.getCallIdHeader().getCallId();
-
String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- logger.info("鏀跺埌ACK锛宺tp/{}寮�濮嬪悜涓婄骇鎺ㄦ祦, 鐩爣={}:{}锛孲SRC={}, RTCP={}", sendRtpItem.getStreamId(),
+ logger.info("[寮�濮嬫帹娴乚 rtp/{}, 鐩爣={}:{}锛孲SRC={}, RTCP={}", sendRtpItem.getStream(),
sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isRtcp());
Map<String, Object> param = new HashMap<>(12);
- param.put("vhost","__defaultVhost__");
- param.put("app",sendRtpItem.getApp());
- param.put("stream",sendRtpItem.getStreamId());
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
param.put("ssrc", sendRtpItem.getSsrc());
param.put("src_port", sendRtpItem.getLocalPort());
param.put("pt", sendRtpItem.getPt());
@@ -1210,39 +1461,35 @@
param.put("is_udp", is_Udp);
if (!sendRtpItem.isTcp()) {
// udp妯″紡涓嬪紑鍚痳tcp淇濇椿
- param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
+ param.put("udp_rtcp_timeout", sendRtpItem.isRtcp() ? "1" : "0");
}
if (mediaInfo == null) {
RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
- sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStreamId(),
+ sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStream(),
sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),
sendRtpItem.getLocalPort(), sendRtpItem.getPt(), sendRtpItem.isUsePs(), sendRtpItem.isOnlyAudio());
redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, json -> {
startSendRtpStreamHand(sendRtpItem, platform, json, param, callIdHeader);
});
} else {
- // 濡傛灉鏄潪涓ユ牸妯″紡锛岄渶瑕佸叧闂鍙ｅ崰鐢�
+ // 濡傛灉鏄弗鏍兼ā寮忥紝闇�瑕佸叧闂鍙ｅ崰鐢�
JSONObject startSendRtpStreamResult = null;
if (sendRtpItem.getLocalPort() != 0) {
- HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(sendRtpItem.getSsrc(), null, mediaInfo.getId());
- hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
- if (zlmrtpServerFactory.releasePort(mediaInfo, sendRtpItem.getSsrc())) {
- if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
- }else {
- param.put("dst_url", sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
- }
- }
- }else {
if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
- }else {
+ startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
+ } else {
param.put("dst_url", sendRtpItem.getIp());
param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+ startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
+ }
+ } else {
+ if (sendRtpItem.isTcpActive()) {
+ startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
+ } else {
+ param.put("dst_url", sendRtpItem.getIp());
+ param.put("dst_port", sendRtpItem.getPort());
+ startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
}
}
if (startSendRtpStreamResult != null) {
@@ -1252,15 +1499,16 @@
}
@Override
- public void startSendRtpStreamHand(SendRtpItem sendRtpItem, ParentPlatform parentPlatform,
+ public void startSendRtpStreamHand(SendRtpItem sendRtpItem, Object correlationInfo,
JSONObject jsonObject, Map<String, Object> param, CallIdHeader callIdHeader) {
if (jsonObject == null) {
logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
- logger.info("璋冪敤ZLM鎺ㄦ祦鎺ュ彛, 缁撴灉锛� {}", jsonObject);
- logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛寋}->{}:{}, " ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"), param.get("dst_url"), param.get("dst_port"));
+ logger.info("璋冪敤ZLM鎺ㄦ祦鎺ュ彛, 缁撴灉锛� {}", jsonObject);
+ logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛寋}->{}, ", param.get("app"), param.get("stream"), jsonObject.getString("local_port"),
+ sendRtpItem.isTcpActive()?"琚姩鍙戞祦": param.get("dst_url") + ":" + param.get("dst_port"));
} else {
- logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}",jsonObject.getString("msg"), JSON.toJSONString(param));
+ logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}", jsonObject.getString("msg"), JSONObject.toJSONString(param));
if (sendRtpItem.isOnlyAudio()) {
Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
@@ -1272,14 +1520,166 @@
logger.error("[鍛戒护鍙戦�佸け璐 鍋滄璇煶瀵硅: {}", e.getMessage());
}
}
- }else {
+ } else {
// 鍚戜笂绾у钩鍙�
- try {
- commanderForPlatform.streamByeCmd(parentPlatform, callIdHeader.getCallId());
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
+ if (correlationInfo instanceof ParentPlatform) {
+ try {
+ ParentPlatform parentPlatform = (ParentPlatform)correlationInfo;
+ commanderForPlatform.streamByeCmd(parentPlatform, callIdHeader.getCallId());
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
+ }
}
}
}
}
+
+ @Override
+ public void talkCmd(Device device, String channelId, MediaServerItem mediaServerItem, String stream, AudioBroadcastEvent event) {
+ if (device == null || channelId == null) {
+ return;
+ }
+ // TODO 蹇呴』澶氱鍙ｆā寮忔墠鏀寔璇煶鍠婅瘽楣よ闊冲璁�
+ 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 mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream());
+ if (streamReady) {
+ logger.warn("[璇煶瀵硅] 姝ｅ湪璇煶骞挎挱锛屾棤娉曞紑鍚闊抽�氳瘽锛� {}", channelId);
+ event.call("姝ｅ湪璇煶骞挎挱");
+ return;
+ } else {
+ stopAudioBroadcast(device.getDeviceId(), channelId);
+ }
+ }
+ }
+
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, stream, null);
+ if (sendRtpItem != null) {
+ MediaServerItem mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, "rtp", sendRtpItem.getReceiveStream());
+ if (streamReady) {
+ logger.warn("[璇煶瀵硅] 杩涜涓細 {}", channelId);
+ event.call("璇煶瀵硅杩涜涓�");
+ return;
+ } else {
+ stopTalk(device, channelId);
+ }
+ }
+
+ talk(mediaServerItem, device, channelId, stream, (mediaServerItem1, hookParam) -> {
+ logger.info("[璇煶瀵硅] 鏀跺埌璁惧鍙戞潵鐨勬祦");
+ }, eventResult -> {
+ logger.warn("[璇煶瀵硅] 澶辫触锛寋}/{}, 閿欒鐮� {} {}", device.getDeviceId(), channelId, eventResult.statusCode, eventResult.msg);
+ event.call("澶辫触锛岄敊璇爜 " + eventResult.statusCode + ", " + eventResult.msg);
+ }, () -> {
+ logger.warn("[璇煶瀵硅] 澶辫触锛寋}/{} 瓒呮椂", device.getDeviceId(), channelId);
+ event.call("澶辫触锛岃秴鏃� ");
+ stopTalk(device, channelId);
+ }, errorMsg -> {
+ logger.warn("[璇煶瀵硅] 澶辫触锛寋}/{} {}", device.getDeviceId(), channelId, errorMsg);
+ event.call(errorMsg);
+ stopTalk(device, channelId);
+ });
+ }
+
+ private void stopTalk(Device device, String channelId) {
+ stopTalk(device, channelId, null);
+ }
+
+ @Override
+ public void stopTalk(Device device, String channelId, Boolean streamIsReady) {
+ logger.info("[璇煶瀵硅] 鍋滄锛� {}/{}", device.getDeviceId(), channelId);
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
+ if (sendRtpItem == null) {
+ logger.info("[璇煶瀵硅] 鍋滄澶辫触锛� 鏈壘鍒板彂閫佷俊鎭紝鍙兘宸茬粡鍋滄");
+ return;
+ }
+ // 鍋滄鍚戣澶囨帹娴�
+ String mediaServerId = sendRtpItem.getMediaServerId();
+ if (mediaServerId == null) {
+ return;
+ }
+
+ MediaServerItem mediaServer = mediaServerService.getOne(mediaServerId);
+
+ if (streamIsReady == null || streamIsReady) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ zlmServerFactory.stopSendRtpStream(mediaServer, param);
+ }
+
+ ssrcFactory.releaseSsrc(mediaServerId, sendRtpItem.getSsrc());
+
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, null, sendRtpItem.getStream());
+ if (ssrcTransaction != null) {
+ try {
+ cmder.streamByeCmd(device, channelId, sendRtpItem.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ logger.info("[璇煶瀵硅] 鍋滄娑堟伅鍙戦�佸け璐ワ紝鍙兘宸茬粡鍋滄");
+ }
+ }
+ redisCatchStorage.deleteSendRTPServer(device.getDeviceId(), channelId,null, null);
+ }
+
+ @Override
+ public void getSnap(String deviceId, String channelId, String fileName, ErrorCallback errorCallback) {
+ Device device = deviceService.getDevice(deviceId);
+ if (device == null) {
+ errorCallback.run(InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getCode(), InviteErrorCode.ERROR_FOR_PARAMETER_ERROR.getMsg(), null);
+ return;
+ }
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+ if (inviteInfo != null) {
+ if (inviteInfo.getStreamInfo() != null) {
+ // 宸插瓨鍦ㄧ嚎鐩存帴鎴浘
+ MediaServerItem mediaServerItemInuse = mediaServerService.getOne(inviteInfo.getStreamInfo().getMediaServerId());
+ String streamUrl;
+ if (mediaServerItemInuse.getRtspPort() != 0) {
+ streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInuse.getRtspPort(), "rtp", inviteInfo.getStreamInfo().getStream());
+ }else {
+ streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.mp4", mediaServerItemInuse.getHttpPort(), "rtp", inviteInfo.getStreamInfo().getStream());
+ }
+ String path = "snap";
+ // 璇锋眰鎴浘
+ logger.info("[璇锋眰鎴浘]: " + fileName);
+ zlmresTfulUtils.getSnap(mediaServerItemInuse, streamUrl, 15, 1, path, fileName);
+ File snapFile = new File(path + File.separator + fileName);
+ if (snapFile.exists()) {
+ errorCallback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), snapFile.getAbsoluteFile());
+ }else {
+ errorCallback.run(InviteErrorCode.FAIL.getCode(), InviteErrorCode.FAIL.getMsg(), null);
+ }
+ return;
+ }
+ }
+
+ MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
+ play(newMediaServerItem, deviceId, channelId, null, (code, msg, data)->{
+ if (code == InviteErrorCode.SUCCESS.getCode()) {
+ InviteInfo inviteInfoForPlay = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+ if (inviteInfoForPlay != null && inviteInfoForPlay.getStreamInfo() != null) {
+ getSnap(deviceId, channelId, fileName, errorCallback);
+ }else {
+ errorCallback.run(InviteErrorCode.FAIL.getCode(), InviteErrorCode.FAIL.getMsg(), null);
+ }
+ }else {
+ errorCallback.run(InviteErrorCode.FAIL.getCode(), InviteErrorCode.FAIL.getMsg(), null);
+ }
+ });
+ }
+
}
--
Gitblit v1.8.0