From 61e5226122e7816dbaa18baec907d0e5934ee170 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 七月 2023 15:07:43 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 12 ------------
1 files changed, 0 insertions(+), 12 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..cde235b 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -542,17 +542,5 @@
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