From 69c81b3b9651a6d0f51c30bde35e92e84a39c26b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 12 五月 2024 06:05:31 +0800
Subject: [PATCH] Merge pull request #1450 from BradyXs/master
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 b8d5f18..f477439 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -195,8 +195,7 @@
}
}
- 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);
}
@@ -207,6 +206,15 @@
}
}
+ 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);
+ }
+ }
+
public void setFmp4(String host, int port, int sslPort, String app, String stream, String callIdParam) {
String file = String.format("%s/%s.live.mp4%s", app, stream, callIdParam);
if (port > 0) {
--
Gitblit v1.8.0