From d8011e9ee7b624bb2641c629e42d81f9665974fc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 17 十二月 2023 23:33:18 +0800
Subject: [PATCH] 去除只有udp收流支持ssrc校验的判断
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
old mode 100644
new mode 100755
index ff63f6f..6befe46
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -1,38 +1,44 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.utils.DateUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.jetbrains.annotations.NotNull;
-import org.springframework.util.unit.DataUnit;
import java.util.List;
-
+@Schema(description = "鎺ㄦ祦淇℃伅")
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{
/**
* id
*/
+ @Schema(description = "id")
private Integer id;
/**
* 搴旂敤鍚�
*/
+ @Schema(description = "搴旂敤鍚�")
private String app;
/**
* 娴乮d
*/
+ @Schema(description = "娴乮d")
private String stream;
/**
* 瑙傜湅鎬讳汉鏁帮紝鍖呮嫭hls/rtsp/rtmp/http-flv/ws-flv
*/
+ @Schema(description = "瑙傜湅鎬讳汉鏁�")
private String totalReaderCount;
/**
* 鍗忚 鍖呮嫭hls/rtsp/rtmp/http-flv/ws-flv
*/
+ @Schema(description = "鍗忚 鍖呮嫭hls/rtsp/rtmp/http-flv/ws-flv")
private List<MediaSchema> schemas;
/**
@@ -46,71 +52,85 @@
* mp4_vod=6,
* device_chn=7
*/
+ @Schema(description = "浜х敓婧愮被鍨�")
private int originType;
/**
* 瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷
*/
- private MediaItem.OriginSock originSock;
+ @Schema(description = "瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷")
+ private OnStreamChangedHookParam.OriginSock originSock;
/**
* 浜х敓婧愮被鍨嬬殑瀛楃涓叉弿杩�
*/
+ @Schema(description = "浜х敓婧愮被鍨嬬殑瀛楃涓叉弿杩�")
private String originTypeStr;
/**
* 浜х敓婧愮殑url
*/
+ @Schema(description = "浜х敓婧愮殑url")
private String originUrl;
/**
* 瀛樻椿鏃堕棿锛屽崟浣嶇
*/
+ @Schema(description = "瀛樻椿鏃堕棿锛屽崟浣嶇")
private Long aliveSecond;
/**
* 闊宠棰戣建閬�
*/
- private List<MediaItem.MediaTrack> tracks;
+ @Schema(description = "闊宠棰戣建閬�")
+ private List<OnStreamChangedHookParam.MediaTrack> tracks;
/**
* 闊宠棰戣建閬�
*/
+ @Schema(description = "闊宠棰戣建閬�")
private String vhost;
/**
* 浣跨敤鐨勬祦濯掍綋ID
*/
+ @Schema(description = "浣跨敤鐨勬祦濯掍綋ID")
private String mediaServerId;
/**
* 浣跨敤鐨勬湇鍔D
*/
+ @Schema(description = "浣跨敤鐨勬湇鍔D")
private String serverId;
/**
* 鎺ㄦ祦鏃堕棿
*/
+ @Schema(description = "鎺ㄦ祦鏃堕棿")
private String pushTime;
/**
* 鏇存柊鏃堕棿
*/
+ @Schema(description = "鏇存柊鏃堕棿")
private String updateTime;
/**
* 鍒涘缓鏃堕棿
*/
+ @Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
/**
* 鏄惁姝ｅ湪鎺ㄦ祦
*/
+ @Schema(description = "鏄惁姝ｅ湪鎺ㄦ祦")
private boolean pushIng;
/**
* 鏄惁鑷繁骞冲彴鐨勬帹娴�
*/
+ @Schema(description = "鏄惁鑷繁骞冲彴鐨勬帹娴�")
private boolean self;
@@ -203,11 +223,11 @@
this.originType = originType;
}
- public MediaItem.OriginSock getOriginSock() {
+ public OnStreamChangedHookParam.OriginSock getOriginSock() {
return originSock;
}
- public void setOriginSock(MediaItem.OriginSock originSock) {
+ public void setOriginSock(OnStreamChangedHookParam.OriginSock originSock) {
this.originSock = originSock;
}
@@ -236,11 +256,11 @@
this.aliveSecond = aliveSecond;
}
- public List<MediaItem.MediaTrack> getTracks() {
+ public List<OnStreamChangedHookParam.MediaTrack> getTracks() {
return tracks;
}
- public void setTracks(List<MediaItem.MediaTrack> tracks) {
+ public void setTracks(List<OnStreamChangedHookParam.MediaTrack> tracks) {
this.tracks = tracks;
}
@@ -305,5 +325,65 @@
public void setSelf(boolean self) {
this.self = self;
}
+
+// @Override
+// public Integer getGbStreamId() {
+// return super.getGbStreamId();
+// }
+//
+// @Override
+// public void setGbStreamId(Integer gbStreamId) {
+// super.setGbStreamId(gbStreamId);
+// }
+//
+//
+// public String getGbId() {
+// return super.getGbId();
+// }
+//
+// public void setGbId(String gbId) {
+// super.setGbId(gbId);
+// }
+//
+// public String getName() {
+// return super.getName();
+// }
+//
+// public void setName(String name) {
+// super.setName(name);
+// }
+//
+// public double getLongitude() {
+// return super.getLongitude();
+// }
+//
+// public void setLongitude(double longitude) {
+// super.setLongitude(longitude);
+// }
+//
+// public double getLatitude() {
+// return super.getLatitude();
+// }
+//
+// public void setLatitude(double latitude) {
+// super.setLatitude(latitude);
+// }
+//
+// public String getStreamType() {
+// return super.getStreamType();
+// }
+//
+// public void setStreamType(String streamType) {
+// super.setStreamType(streamType);
+// }
+//
+// public boolean isStatus() {
+// return super.isStatus();
+// }
+//
+// public void setStatus(boolean status) {
+// super.setStatus(status);
+// }
+
}
--
Gitblit v1.8.0