From 8985905bbe9307cbe10b49d9efec082eebb45ada Mon Sep 17 00:00:00 2001
From: koisi <kor.coeo@gmail.com>
Date: 星期一, 05 八月 2024 17:06:00 +0800
Subject: [PATCH] Merge pull request #1 from koisi-io/fix2
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
index 979f54a..96a987c 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.common;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,7 +71,7 @@
@Schema(description = "娴佸獟浣揑D")
private String mediaServerId;
@Schema(description = "娴佺紪鐮佷俊鎭�")
- private Object tracks;
+ private MediaInfo mediaInfo;
@Schema(description = "寮�濮嬫椂闂�")
private String startTime;
@Schema(description = "缁撴潫鏃堕棿")
@@ -82,6 +83,12 @@
@Schema(description = "鏄惁鏆傚仠锛堝綍鍍忓洖鏀句娇鐢級")
private boolean pause;
+
+ @Schema(description = "浜х敓婧愮被鍨嬶紝鍖呮嫭 unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7")
+ private int originType;
+
+ @Schema(description = "杞爜鍚庣殑瑙嗛娴�")
+ private StreamInfo transcodeStream;
public void setFlv(StreamURL flv) {
this.flv = flv;
@@ -191,14 +198,22 @@
}
}
- public void setFlv(String host, int port, int sslPort, String app, String stream, String callIdParam) {
- String file = String.format("%s/%s.live.flv%s", app, stream, callIdParam);
+ public void setFlv(String host, int port, int sslPort, String file) {
if (port > 0) {
this.flv = new StreamURL("http", host, port, file);
}
this.ws_flv = new StreamURL("ws", host, port, file);
if (sslPort > 0) {
this.https_flv = new StreamURL("https", host, sslPort, file);
+ this.wss_flv = new StreamURL("wss", host, sslPort, file);
+ }
+ }
+
+ public void setWsFlv(String host, int port, int sslPort, String file) {
+ if (port > 0) {
+ this.ws_flv = new StreamURL("ws", host, port, file);
+ }
+ if (sslPort > 0) {
this.wss_flv = new StreamURL("wss", host, sslPort, file);
}
}
@@ -473,12 +488,12 @@
this.mediaServerId = mediaServerId;
}
- public Object getTracks() {
- return tracks;
+ public MediaInfo getMediaInfo() {
+ return mediaInfo;
}
- public void setTracks(Object tracks) {
- this.tracks = tracks;
+ public void setMediaInfo(MediaInfo mediaInfo) {
+ this.mediaInfo = mediaInfo;
}
public String getStartTime() {
@@ -519,6 +534,14 @@
public void setTransactionInfo(TransactionInfo transactionInfo) {
this.transactionInfo = transactionInfo;
+ }
+
+ public StreamInfo getTranscodeStream() {
+ return transcodeStream;
+ }
+
+ public void setTranscodeStream(StreamInfo transcodeStream) {
+ this.transcodeStream = transcodeStream;
}
@Override
@@ -615,4 +638,12 @@
public void setDownLoadFilePath(DownloadFileInfo downLoadFilePath) {
this.downLoadFilePath = downLoadFilePath;
}
+
+ public int getOriginType() {
+ return originType;
+ }
+
+ public void setOriginType(int originType) {
+ this.originType = originType;
+ }
}
--
Gitblit v1.8.0