From c8831bc58fd967a4215cbe3ea8c89d753b4d31f7 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期五, 06 五月 2022 11:56:29 +0800
Subject: [PATCH] 更新同步wvp
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 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 57ba4a5..7f62968 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
@@ -2,12 +2,10 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.UUID;
import com.alibaba.fastjson.JSON;
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.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
@@ -17,9 +15,8 @@
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;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +51,7 @@
private IPlayService playService;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -81,13 +78,10 @@
private ZLMHttpHookSubscribe subscribe;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
@Autowired
private VideoStreamSessionManager sessionManager;
-
- @Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
/**
* 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
@@ -192,6 +186,12 @@
ret.put("code", 0);
ret.put("msg", "success");
ret.put("enable_hls", true);
+ if (json.getInteger("originType") == 1
+ || json.getInteger("originType") == 2
+ || json.getInteger("originType") == 3) {
+ ret.put("enable_audio", true);
+ }
+
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) {
@@ -206,9 +206,9 @@
String app = json.getString("app");
String stream = json.getString("stream");
if ("rtp".equals(app)) {
- ret.put("enable_mp4", userSetup.getRecordSip());
+ ret.put("enable_mp4", userSetting.getRecordSip());
}else {
- ret.put("enable_mp4", userSetup.isRecordPushLive());
+ ret.put("enable_mp4", userSetting.isRecordPushLive());
}
List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, stream);
if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
@@ -218,7 +218,16 @@
if (deviceChannel != null) {
ret.put("enable_audio", deviceChannel.isHasAudio());
}
+ // 濡傛灉鏄綍鍍忎笅杞藉氨璁剧疆瑙嗛闂撮殧鍗佺
+ if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.download) {
+ ret.put("mp4_max_second", 10);
+ ret.put("enable_mp4", true);
+ ret.put("enable_audio", true);
+ }
+
}
+
+
return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
}
@@ -327,7 +336,6 @@
if (mediaInfo != null) {
subscribe.response(mediaInfo, json);
}
-
}
// 娴佹秷澶辩Щ闄edis play
String app = item.getApp();
@@ -388,7 +396,7 @@
}
}
if (gbStreams.size() > 0) {
- eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
+// eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
}
}else {
@@ -400,14 +408,14 @@
}
GbStream gbStream = storager.getGbStream(app, streamId);
if (gbStream != null) {
- eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
+// eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
}
zlmMediaListManager.removeMedia(app, streamId);
}
if (type != null) {
// 鍙戦�佹祦鍙樺寲redis娑堟伅
JSONObject jsonObject = new JSONObject();
- jsonObject.put("serverId", userSetup.getServerId());
+ jsonObject.put("serverId", userSetting.getServerId());
jsonObject.put("app", app);
jsonObject.put("stream", streamId);
jsonObject.put("register", regist);
@@ -444,6 +452,7 @@
if ("rtp".equals(app)){
ret.put("close", true);
StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
+ SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, null, streamId);
if (streamInfoForPlayCatch != null) {
// 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€��
if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
@@ -481,18 +490,6 @@
streamProxyService.del(app, streamId);
String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();
logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", app, streamId, url);
-
- }else if (streamProxyItem != null && streamProxyItem.isEnable()) {
- MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- if(null!=mediaServerItem){
- JSONObject jsonObject = zlmresTfulUtils.closeStreams(mediaServerItem,streamProxyItem.getApp(), streamProxyItem.getStream());
- if (jsonObject.getInteger("code") == 0) {
- streamProxyItem.setEnable(false);
- storager.updateStreamProxy(streamProxyItem);
- }
- }else {
- ret.put("close", false);
- }
}else {
ret.put("close", false);
}
@@ -512,7 +509,7 @@
}
String mediaServerId = json.getString("mediaServerId");
MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (userSetup.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
+ if (userSetting.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
String app = json.getString("app");
String streamId = json.getString("stream");
if ("rtp".equals(app)) {
--
Gitblit v1.8.0