From 019827fd35f84465ee503fcc248b12a045da44d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 18:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
index 4c68c61..60f3303 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
@@ -65,4 +65,10 @@
      * @return
      */
     JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);
+
+    /**
+     * 鏍规嵁app涓巗tream鑾峰彇streamProxy
+     * @return
+     */
+    StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId);
 }

--
Gitblit v1.8.0