From 619a66f9998fa646a69903a4c22e2bbf92e2221b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 28 七月 2021 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 023c075..12e4898 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.github.pagehelper.PageInfo;
@@ -10,7 +11,7 @@
* 淇濆瓨瑙嗛浠ｇ悊
* @param param
*/
- void save(StreamProxyItem param);
+ String save(StreamProxyItem param);
/**
* 娣诲姞瑙嗛浠ｇ悊鍒皕lm
@@ -56,4 +57,10 @@
* @return
*/
boolean stop(String app, String stream);
+
+ /**
+ * 鑾峰彇ffmpeg.cmd妯℃澘
+ * @return
+ */
+ JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);
}
--
Gitblit v1.8.0