From da14c7f24c61cf9027a02d8e566ab89116136f19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 九月 2020 17:22:22 +0800
Subject: [PATCH] 拆分redis中device与channel的存储方式 支持分页 接口直接返回播放地址
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index aaf347d..104fab0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -15,8 +15,14 @@
import javax.sip.header.ViaHeader;
import javax.sip.message.Request;
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -42,6 +48,9 @@
@Autowired
private VideoStreamSessionManager streamSession;
+
+ @Autowired
+ private IVideoManagerStorager storager;
@Autowired
@Qualifier(value="tcpSipProvider")
@@ -50,6 +59,9 @@
@Autowired
@Qualifier(value="udpSipProvider")
private SipProvider udpSipProvider;
+
+ @Value("${media.ip}")
+ private String mediaIp;
/**
* 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
@@ -58,7 +70,6 @@
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
- * @param moveSpeed 闀滃ご绉诲姩閫熷害
*/
@Override
public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {
@@ -191,7 +202,7 @@
* @param channelId 棰勮閫氶亾
*/
@Override
- public String playStreamCmd(Device device, String channelId) {
+ public StreamInfo playStreamCmd(Device device, String channelId) {
try {
String ssrc = streamSession.createPlaySsrc();
@@ -223,7 +234,24 @@
ClientTransaction transaction = transmitRequest(device, request);
streamSession.put(ssrc, transaction);
- return ssrc;
+ DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);
+ if (deviceChannel != null) {
+ deviceChannel.setSsrc(ssrc);
+ storager.updateChannel(device.getDeviceId(), deviceChannel);
+ }
+ MediaServerConfig mediaInfo = storager.getMediaInfo();
+ StreamInfo streamInfo = new StreamInfo();
+ streamInfo.setSsrc(ssrc);
+// String streamId = Integer.toHexString(Integer.parseInt(streamInfo.getSsrc()));
+ String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); // ZLM 瑕佹眰澶у啓涓旈浣嶈ˉ闆�
+ streamInfo.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaIp, mediaInfo.getHttpPort(), streamId));
+ streamInfo.setWS_FLV(String.format("ws://%s:%s/rtp/%s.flv", mediaIp, mediaInfo.getHttpPort(), streamId));
+ streamInfo.setRTMP(String.format("rtmp://%s:%s/rtp/%s", mediaIp, mediaInfo.getRtmpPort(), streamId));
+ streamInfo.setHLS(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaIp, mediaInfo.getHttpPort(), streamId));
+ streamInfo.setRTSP(String.format("rtsp://%s:%s/rtp/%s", mediaIp, mediaInfo.getRtspPort(), streamId));
+
+ storager.startPlay(device.getDeviceId(), channelId, streamInfo);
+ return streamInfo;
} catch ( SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return null;
@@ -281,8 +309,6 @@
/**
* 瑙嗛娴佸仠姝�
*
- * @param device 瑙嗛璁惧
- * @param channelId 棰勮閫氶亾
*/
@Override
public void streamByeCmd(String ssrc) {
--
Gitblit v1.8.0