From 90ab3966526b8c222adbd9078d8083fb9e02422d Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Wed, 12 Mar 2025 16:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E6=B5=81=E4=BB=A3=E7=90=86=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=B5=81=E5=9C=B0=E5=9D=80=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E6=9D=A5=E6=BA=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/media/zlm/ZLMMediaNodeServerService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java index f8c0365e..0edc415b 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java @@ -197,7 +197,6 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { } public StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServer, String app, String stream, MediaInfo mediaInfo, String callId, boolean isPlay) { - System.out.println(callId); StreamInfo streamInfoResult = new StreamInfo(); streamInfoResult.setServerId(userSetting.getServerId()); streamInfoResult.setStream(stream); @@ -462,10 +461,11 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { streamProxy.getStream()); } MediaInfo mediaInfo = getMediaInfo(mediaServer, streamProxy.getApp(), streamProxy.getStream()); + if (mediaInfo != null) { if (mediaInfo.getOriginUrl() != null && mediaInfo.getOriginUrl().equals(streamProxy.getSrcUrl())) { log.info("[启动拉流代理] 已存在， 直接返回， app： {}, stream: {}", mediaInfo.getApp(), streamProxy.getStream()); - return getStreamInfoByAppAndStream(mediaServer, streamProxy.getApp(), streamProxy.getStream(), null, null, true); + return getStreamInfoByAppAndStream(mediaServer, streamProxy.getApp(), streamProxy.getStream(), mediaInfo, null, true); } closeStreams(mediaServer, streamProxy.getApp(), streamProxy.getStream()); } @@ -492,7 +492,13 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { throw new ControllerException(jsonObject.getInteger("code"), "代理结果异常： " + jsonObject); }else { streamProxy.setStreamKey(jsonObject.getString("key")); - return getStreamInfoByAppAndStream(mediaServer, streamProxy.getApp(), streamProxy.getStream(), null, null, true); + // 由于此时流未注册，手动拼装流信息 + mediaInfo = new MediaInfo(); + mediaInfo.setApp(streamProxy.getApp()); + mediaInfo.setStream(streamProxy.getStream()); + mediaInfo.setOriginType(4); + mediaInfo.setOriginTypeStr("pull"); + return getStreamInfoByAppAndStream(mediaServer, streamProxy.getApp(), streamProxy.getStream(), mediaInfo, null, true); } } }