From 6ed563e4b4e8387fc397d53c0533009d5a8866a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 十一月 2021 15:04:03 +0800
Subject: [PATCH] Merge pull request #243 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
index 51c5979..a261d24 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
@@ -38,7 +38,13 @@
@Override
public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId, String addr) {
StreamInfo streamInfo = null;
- MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+
+ MediaServerItem mediaInfo;
+ if (mediaServerId == null) {
+ mediaInfo = mediaServerService.getDefaultMediaServer();
+ }else {
+ mediaInfo = mediaServerService.getOne(mediaServerId);
+ }
if (mediaInfo == null) {
return streamInfo;
}
@@ -55,6 +61,8 @@
return streamInfo;
}
+
+
@Override
public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId) {
return getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, null);
--
Gitblit v1.8.0