From d21a00418e04cc773eaeeff3d220e5931023929a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 三月 2022 16:58:50 +0800
Subject: [PATCH] 修复推流关联平台的bug
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 150 +++++++++++++++++++++++++++++--------------------
1 files changed, 88 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 8c1239e..bd39a0c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -1,14 +1,20 @@
package com.genersoft.iot.vmp.media.zlm;
+import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.dto.*;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
@@ -66,7 +72,7 @@
private IMediaService mediaService;
@Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ private EventPublisher eventPublisher;
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@@ -78,7 +84,7 @@
private UserSetup userSetup;
@Autowired
- private MediaConfig mediaConfig;
+ private VideoStreamSessionManager sessionManager;
/**
* 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
@@ -178,12 +184,11 @@
@PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
public ResponseEntity<String> onPublish(@RequestBody JSONObject json) {
- logger.debug("[ ZLM HOOK ]on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
+ logger.info("[ ZLM HOOK ]on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- ret.put("enableHls", true);
- ret.put("enableMP4", userSetup.isRecordPushLive());
+ ret.put("enable_hls", true);
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) {
@@ -197,15 +202,20 @@
}
String app = json.getString("app");
String stream = json.getString("stream");
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);
-
- // 褰曞儚鍥炴斁鏃朵笉杩涜褰曞儚涓嬭浇
- if (streamInfo != null) {
- ret.put("enableMP4", false);
+ if ("rtp".equals(app)) {
+ ret.put("enable_mp4", userSetup.getRecordSip());
}else {
- ret.put("enableMP4", userSetup.isRecordPushLive());
+ ret.put("enable_mp4", userSetup.isRecordPushLive());
}
-
+ List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, stream);
+ if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
+ String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
+ String channelId = ssrcTransactionForAll.get(0).getChannelId();
+ DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
+ if (deviceChannel != null) {
+ ret.put("enable_audio", deviceChannel.isHasAudio());
+ }
+ }
return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
}
@@ -302,7 +312,7 @@
@ResponseBody
@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){
-
+
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_stream_changed API璋冪敤锛屽弬鏁帮細" + JSONObject.toJSONString(item));
}
@@ -322,14 +332,17 @@
String schema = item.getSchema();
List<MediaItem.MediaTrack> tracks = item.getTracks();
boolean regist = item.isRegist();
- if (tracks != null) {
- logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);
- }
if ("rtmp".equals(schema)){
+ logger.info("on_stream_changed锛氭敞鍐�->{}, app->{}, stream->{}", regist, app, streamId);
if (regist) {
mediaServerService.addCount(mediaServerId);
}else {
mediaServerService.removeCount(mediaServerId);
+ }
+ if (item.getOriginType() == OriginType.PULL.ordinal()
+ || item.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {
+ // 璁剧疆鎷夋祦浠ｇ悊涓婄嚎/绂荤嚎
+ streamProxyService.updateStatus(regist, app, streamId);
}
if ("rtp".equals(app) && !regist ) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
@@ -337,44 +350,67 @@
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
}else{
- streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- redisCatchStorage.stopPlayback(streamInfo);
+ streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
+ if (streamInfo != null) {
+ redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),
+ streamInfo.getStream(), null);
+ }
+
}
}else {
if (!"rtp".equals(app)){
String type = OriginType.values()[item.getOriginType()].getType();
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+
if (mediaServerItem != null){
if (regist) {
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);
- redisCatchStorage.addStream(mediaServerItem, type, app, streamId, streamInfo);
+ StreamPushItem streamPushItem = null;
+ StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);
+ item.setStreamInfo(streamInfoByAppAndStream);
+
+ redisCatchStorage.addStream(mediaServerItem, type, app, streamId, item);
if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
|| item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {
- zlmMediaListManager.addPush(item);
+ streamPushItem = zlmMediaListManager.addPush(item);
}
- }else {
- // 鍏煎娴佹敞閿�鏃剁被鍨嬮敊璇殑闂锛岀瓑zlm鏇存柊鍚庡垹闄�
- StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
- if (streamPushItem != null) {
- type = "PUSH";
+
+ List<GbStream> gbStreams = new ArrayList<>();
+ if (streamPushItem == null || streamPushItem.getGbId() == null) {
+ GbStream gbStream = storager.getGbStream(app, streamId);
+ gbStreams.add(gbStream);
}else {
- StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
- if (streamProxyByAppAndStream != null) {
- type = "PULL";
+ if (streamPushItem.getGbId() != null) {
+ gbStreams.add(streamPushItem);
}
}
+ if (gbStreams.size() > 0) {
+ eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
+ }
+
+ }else {
+ // 鍏煎娴佹敞閿�鏃剁被鍨嬩粠redis璁板綍鑾峰彇
+ MediaItem mediaItem = redisCatchStorage.getStreamInfo(app, streamId, mediaServerId);
+ if (mediaItem != null) {
+ type = OriginType.values()[mediaItem.getOriginType()].getType();
+ redisCatchStorage.removeStream(mediaServerItem.getId(), type, app, streamId);
+ }
+ GbStream gbStream = storager.getGbStream(app, streamId);
+ if (gbStream != null) {
+ eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
+ }
zlmMediaListManager.removeMedia(app, streamId);
- redisCatchStorage.removeStream(mediaServerItem.getId(), type, app, streamId);
}
- // 鍙戦�佹祦鍙樺寲redis娑堟伅
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("serverId", userSetup.getServerId());
- jsonObject.put("app", app);
- jsonObject.put("stream", streamId);
- jsonObject.put("register", regist);
- jsonObject.put("mediaServerId", mediaServerId);
- redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
+ if (type != null) {
+ // 鍙戦�佹祦鍙樺寲redis娑堟伅
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("serverId", userSetup.getServerId());
+ jsonObject.put("app", app);
+ jsonObject.put("stream", streamId);
+ jsonObject.put("register", regist);
+ jsonObject.put("mediaServerId", mediaServerId);
+ redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
+ }
}
}
}
@@ -410,17 +446,20 @@
if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
ret.put("close", false);
} else {
- cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
+ cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId(),
+ streamInfoForPlayCatch.getStream(), null);
redisCatchStorage.stopPlay(streamInfoForPlayCatch);
storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
}
}else{
- StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
if (streamInfoForPlayBackCatch != null) {
- cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());
- redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
+ cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(),
+ streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
+ redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
+ streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
}else {
- StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId);
+ StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
// 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
if (streamInfoForDownload != null) {
ret.put("close", false);
@@ -428,7 +467,7 @@
}
}
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) {
+ if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
ret.put("close", false);
}
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
@@ -444,7 +483,6 @@
}
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
-
}
/**
@@ -459,7 +497,7 @@
}
String mediaServerId = json.getString("mediaServerId");
MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (userSetup.isAutoApplyPlay() && mediaInfo != null) {
+ if (userSetup.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
String app = json.getString("app");
String streamId = json.getString("stream");
if ("rtp".equals(app)) {
@@ -467,30 +505,18 @@
if (s.length == 2) {
String deviceId = s[0];
String channelId = s[1];
- Device device = storager.queryVideoDevice(deviceId);
+ Device device = redisCatchStorage.getDevice(deviceId);
if (device != null) {
- UUID uuid = UUID.randomUUID();
- SSRCInfo ssrcInfo;
- String streamId2 = null;
- if (mediaInfo.isRtpEnable()) {
- streamId2 = String.format("%s_%s", device.getDeviceId(), channelId);
- }
- ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2);
- cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- playService.onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid.toString());
- }, null);
+ playService.play(mediaInfo,deviceId, channelId, null, null, null);
}
-
}
}
-
}
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
}
/**
--
Gitblit v1.8.0