From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 3610f31..2378d52 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -25,6 +25,8 @@
private OkHttpClient client;
+
+
public interface RequestCallback{
void run(JSONObject response);
}
@@ -152,7 +154,6 @@
public void sendGetForImg(MediaServerItem mediaServerItem, String api, Map<String, Object> params, String targetPath, String fileName) {
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
- logger.debug(url);
HttpUrl parseUrl = HttpUrl.parse(url);
if (parseUrl == null) {
return;
@@ -276,6 +277,10 @@
return sendPost(mediaServerItem, "closeRtpServer",param, null);
}
+ public void closeRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param, RequestCallback callback) {
+ sendPost(mediaServerItem, "closeRtpServer",param, callback);
+ }
+
public JSONObject listRtpServer(MediaServerItem mediaServerItem) {
return sendPost(mediaServerItem, "listRtpServer",null, null);
}
@@ -323,9 +328,9 @@
sendPost(mediaServerItem, "kick_sessions",param, null);
}
- public void getSnap(MediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
+ public void getSnap(MediaServerItem mediaServerItem, String streamUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
Map<String, Object> param = new HashMap<>(3);
- param.put("url", flvUrl);
+ param.put("url", streamUrl);
param.put("timeout_sec", timeout_sec);
param.put("expire_sec", expire_sec);
sendGetForImg(mediaServerItem, "getSnap", param, targetPath, fileName);
@@ -342,4 +347,19 @@
param.put("stream_id", streamId);
return sendPost(mediaServerItem, "resumeRtpCheck",param, null);
}
+
+ public JSONObject connectRtpServer(MediaServerItem mediaServerItem, String dst_url, int dst_port, String stream_id) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("dst_url", dst_url);
+ param.put("dst_port", dst_port);
+ param.put("stream_id", stream_id);
+ return sendPost(mediaServerItem, "connectRtpServer",param, null);
+ }
+
+ public JSONObject updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("ssrc", ssrc);
+ param.put("stream_id", streamId);
+ return sendPost(mediaServerItem, "updateRtpServerSSRC",param, null);
+ }
}
--
Gitblit v1.8.0