From 74ad4235f1738ea8ca954bd396a35ddf90a6e37b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 13:01:56 +0800
Subject: [PATCH] 修复tcp主动的推流
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 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 5bda636..f91dcc6 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -237,11 +237,11 @@
}
}
- public void setRtc(String host, int port, int sslPort, String app, String stream, String 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=play%s", app, stream, callIdParam);
+ 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);
}
@@ -541,18 +541,6 @@
public void setSubStream(boolean subStream) {
this.subStream = subStream;
}
-
- public static String getPlayStream(String deviceId,String channelId,boolean isSubStream){
- String streamId;
- if(isSubStream){
- streamId = String.format("%s_%s_%s","sub",deviceId, channelId);
- }else {
- streamId = String.format("%s_%s_%s","main", deviceId, channelId);
- }
- return streamId;
- }
-
- /*=========================璁惧涓诲瓙鐮佹祦閫昏緫END====================*/
}
--
Gitblit v1.8.0