From e625520bc8be62a844735195ffa5a76daf021d40 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 14 Dec 2020 10:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E7=A0=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A5=E4=BD=BF=E7=94=A8127.0.0.1,=20=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=BA=90IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/vmanager/play/PlayController.java | 4 +++- .../iot/vmp/vmanager/playback/PlaybackController.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java index d0431db7..4d769ee5 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java @@ -64,6 +64,7 @@ public class PlayController { DeferredResult> result = new DeferredResult>(); // 超时处理 result.onTimeout(()->{ + logger.warn(String.format("设备点播超时，deviceId：%s ，channelId：%s", deviceId, channelId)); RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); msg.setData("Timeout"); @@ -141,7 +142,8 @@ public class PlayController { MediaServerConfig mediaInfo = storager.getMediaInfo(); String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(), streamId ); - JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000"); + String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId); + JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000"); System.out.println(jsonObject); JSONObject result = new JSONObject(); if (jsonObject != null && jsonObject.getInteger("code") == 0) { diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java index 156f5155..2e32b1bb 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java @@ -62,6 +62,7 @@ public class PlaybackController { DeferredResult> result = new DeferredResult>(); // 超时处理 result.onTimeout(()->{ + logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId)); RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); msg.setData("Timeout");