From 30ae9e929fad80f624ab632c53081db3d2dc9aec Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 25 五月 2023 17:28:57 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 9d4323b..80b97f2 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -237,9 +237,11 @@
}
}
- public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) {
- callIdParam = Objects.equals(callIdParam, "") ? callIdParam : callIdParam.replace("?", "&");
- String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam);
+ public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam, boolean isPlay) {
+ if (callIdParam != null) {
+ callIdParam = Objects.equals(callIdParam, "") ? callIdParam : callIdParam.replace("?", "&");
+ }
+ String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s%s", app, stream, isPlay?"play":"push", callIdParam);
if (port > 0) {
this.rtc = new StreamURL("http", host, port, file);
}
--
Gitblit v1.8.0