From 2d4bbbea8e40488ca07662a022c33bc36ee038fa Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 29 六月 2023 17:10:14 +0800
Subject: [PATCH] 优化更新通道的civicode判断
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 9c5a472..c1b42f8 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -9,6 +9,8 @@
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.HookParam;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRtpServerTimeoutHookParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -303,10 +305,10 @@
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
Integer finalLocalPort = localPort;
hookSubscribe.addSubscribe(hookSubscribeForRtpServerTimeout,
- (MediaServerItem mediaServerItem, JSONObject response)->{
- System.out.println("鐩戝惉绔彛鍒版湡缁х画淇濇寔鐩戝惉");
- System.out.println(response);
- if (ssrc.equals(response.getString("stream_id"))) {
+ (MediaServerItem mediaServerItem, HookParam hookParam)->{
+ logger.info("[涓婄骇鐐规挱] {}->鐩戝惉绔彛鍒版湡缁х画淇濇寔鐩戝惉: {}", ssrc, finalLocalPort);
+ OnRtpServerTimeoutHookParam rtpServerTimeoutHookParam = (OnRtpServerTimeoutHookParam) hookParam;
+ if (ssrc.equals(rtpServerTimeoutHookParam.getSsrc())) {
if (keepPortCallback.keep(ssrc)) {
logger.info("[涓婄骇鐐规挱] {}->鐩戝惉绔彛鍒版湡缁х画淇濇寔鐩戝惉", ssrc);
keepPort(serverItem, ssrc, finalLocalPort, keepPortCallback);
@@ -315,13 +317,13 @@
releasePort(serverItem, ssrc);
}
}
-
});
logger.info("[涓婄骇鐐规挱] {}->鐩戝惉绔彛: {}", ssrc, localPort);
+ return localPort;
}else {
- logger.info("[涓婄骇鐐规挱] 鐩戝惉绔彛澶辫触: {}", ssrc);
+ logger.info("[涓婄骇鐐规挱] 鐩戝惉绔彛澶辫触: {}->{}", ssrc, localPort);
+ return 0;
}
- return localPort;
}
/**
@@ -348,6 +350,9 @@
*/
public Boolean isRtpReady(MediaServerItem mediaServerItem, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem,"rtp", "rtsp", streamId);
+ if (mediaInfo.getInteger("code") == -2) {
+ return null;
+ }
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
@@ -356,8 +361,10 @@
*/
public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId);
- return mediaInfo != null && (mediaInfo.getInteger("code") == 0
-
+ if (mediaInfo == null || (mediaInfo.getInteger("code") == -2)) {
+ return null;
+ }
+ return (mediaInfo.getInteger("code") == 0
&& mediaInfo.getJSONArray("data") != null
&& mediaInfo.getJSONArray("data").size() > 0);
}
@@ -404,4 +411,19 @@
public void closeAllSendRtpStream() {
}
+
+ public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ boolean result = false;
+ JSONObject jsonObject = zlmresTfulUtils.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ if (jsonObject == null) {
+ logger.error("[鏇存柊RTPServer] 澶辫触: 璇锋鏌LM鏈嶅姟");
+ } else if (jsonObject.getInteger("code") == 0) {
+ result= true;
+ logger.info("[鏇存柊RTPServer] 鎴愬姛");
+ } else {
+ logger.error("[鏇存柊RTPServer] 澶辫触: {}, streamId锛歿}锛宻src锛歿}->\r\n{}",jsonObject.getString("msg"),
+ streamId, ssrc, jsonObject);
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0