From 6ae33f2a67ac7bfd2145f05068f2e5ecf15d3f2c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 九月 2022 14:01:22 +0800
Subject: [PATCH] 修复空指针
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index f636a87..0ecc717 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -44,11 +44,15 @@
void updateVmServer(List<MediaServerItem> mediaServerItemList);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback);
- void closeRTPServer(Device device, String channelId);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port);
+
+ void closeRTPServer(MediaServerItem mediaServerItem, String streamId);
+
+ void closeRTPServer(String mediaServerId, String streamId);
void clearRTPServer(MediaServerItem mediaServerItem);
@@ -58,11 +62,11 @@
void removeCount(String mediaServerId);
- void releaseSsrc(MediaServerItem mediaServerItem, String ssrc);
+ void releaseSsrc(String mediaServerItemId, String ssrc);
void clearMediaServerForOnline();
- WVPResult<String> add(MediaServerItem mediaSerItem);
+ void add(MediaServerItem mediaSerItem);
int addToDatabase(MediaServerItem mediaSerItem);
@@ -70,7 +74,7 @@
void resetOnlineServerItem(MediaServerItem serverItem);
- WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
+ MediaServerItem checkMediaServer(String ip, int port, String secret);
boolean checkMediaRecordServer(String ip, int port);
@@ -81,4 +85,6 @@
MediaServerItem getDefaultMediaServer();
void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
+
+ boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
}
--
Gitblit v1.8.0