From d474bf929e3787b6ac88cfb5b2ee242844a0339b Mon Sep 17 00:00:00 2001
From: dengming <dengming@ctfo.com>
Date: 星期四, 10 三月 2022 15:24:50 +0800
Subject: [PATCH] 删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index f226a37..600dad8 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -167,13 +167,14 @@
if (mediaServerItem != null) {
String streamId = String.format("%s_%s", deviceId, channelId);
zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem, ssrc);
+ releaseSsrc(mediaServerItem.getId(), ssrc);
}
streamSession.remove(deviceId, channelId, stream);
}
@Override
- public void releaseSsrc(MediaServerItem mediaServerItem, String ssrc) {
+ public void releaseSsrc(String mediaServerItemId, String ssrc) {
+ MediaServerItem mediaServerItem = getOne(mediaServerItemId);
if (mediaServerItem == null || ssrc == null) {
return;
}
@@ -511,7 +512,7 @@
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
+ param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS()==-1?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
--
Gitblit v1.8.0