From 14174ff40022a1f7662759d478d06b7b350ccd98 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 03 三月 2022 16:28:32 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 159cd05..6a5642e 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
@@ -162,15 +162,16 @@
}
@Override
- public void closeRTPServer(Device device, String channelId) {
- String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId);
+ public void closeRTPServer(Device device, String channelId, String stream) {
+ String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId, stream);
+ String ssrc = streamSession.getSSRC(device.getDeviceId(), channelId, stream);
MediaServerItem mediaServerItem = this.getOne(mediaServerId);
if (mediaServerItem != null) {
String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem, streamSession.getSSRC(device.getDeviceId(), channelId));
+ releaseSsrc(mediaServerItem, ssrc);
}
- streamSession.remove(device.getDeviceId(), channelId);
+ streamSession.remove(device.getDeviceId(), channelId, stream);
}
@Override
--
Gitblit v1.8.0