From 3d51317f62a81851f8da05136c3eb52dad6be0f3 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sat, 6 May 2023 17:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E6=A0=87=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=82=B9=E6=92=AD=E4=B8=89=E7=A7=8D=E7=82=B9=E6=92=AD?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=88=E8=87=AA=E5=8A=A8=E7=82=B9=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E7=BA=A7=E7=82=B9=E6=92=AD=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=82=B9=E6=92=AD=EF=BC=89=E5=B9=B6=E5=8F=91=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/service/impl/PlayServiceImpl.java | 2 - .../vmanager/gb28181/play/PlayController.java | 2 - .../vmp/web/gb28181/ApiStreamController.java | 43 ------------------- 3 files changed, 47 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index 1fcac383..e43f8db0 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -124,9 +124,7 @@ public class PlayServiceImpl implements IPlayService { InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId); if (inviteInfo != null ) { - System.out.println("inviteInfo 已存在"); if (inviteInfo.getStreamInfo() == null) { - System.out.println("inviteInfo 已存在， StreamInfo 不存在，添加回调等待"); // 点播发起了但是尚未成功, 仅注册回调等待结果即可 inviteStreamService.once(InviteSessionType.PLAY, deviceId, channelId, null, callback); return inviteInfo.getSsrcInfo(); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java index eb828a89..f6f42b38 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java @@ -117,8 +117,6 @@ public class PlayController { resultHolder.put(key, uuid, result); playService.play(newMediaServerItem, deviceId, channelId, ((code, msg, data) -> { - System.out.println("controller收到回调"); - System.out.println(JSON.toJSONString(data)); WVPResult wvpResult = new WVPResult<>(); if (code == InviteErrorCode.SUCCESS.getCode()) { wvpResult.setCode(ErrorCode.SUCCESS.getCode()); diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java index 5d04f107..8e35d04f 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java @@ -120,49 +120,6 @@ public class ApiStreamController { return resultDeferredResult; } MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); -// playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{ -// InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code); -// if (inviteInfo != null && inviteInfo.getStreamInfo() != null) { -// JSONObject result = new JSONObject(); -// result.put("StreamID", inviteInfo.getStreamInfo().getStream()); -// result.put("DeviceID", device.getDeviceId()); -// result.put("ChannelID", code); -// result.put("ChannelName", deviceChannel.getName()); -// result.put("ChannelCustomName", ""); -// result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl()); -// result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl()); -// result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl()); -// result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl()); -// result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl()); -// result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl()); -// result.put("CDN", ""); -// result.put("SnapURL", ""); -// result.put("Transport", device.getTransport()); -// result.put("StartAt", ""); -// result.put("Duration", ""); -// result.put("SourceVideoCodecName", ""); -// result.put("SourceVideoWidth", ""); -// result.put("SourceVideoHeight", ""); -// result.put("SourceVideoFrameRate", ""); -// result.put("SourceAudioCodecName", ""); -// result.put("SourceAudioSampleRate", ""); -// result.put("AudioEnable", ""); -// result.put("Ondemand", ""); -// result.put("InBytes", ""); -// result.put("InBitRate", ""); -// result.put("OutBytes", ""); -// result.put("NumOutputs", ""); -// result.put("CascadeSize", ""); -// result.put("RelaySize", ""); -// result.put("ChannelPTZType", "0"); -// resultDeferredResult.setResult(result); -// } -// -// }, (eventResult) -> { -// JSONObject result = new JSONObject(); -// result.put("error", "channel[ " + code + " ] " + eventResult.msg); -// resultDeferredResult.setResult(result); -// }, null); playService.play(newMediaServerItem, serial, code, (errorCode, msg, data) -> {