From 490c55381f75e4c43c050de593eb1a418d9a83ed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 06 五月 2023 17:59:12 +0800
Subject: [PATCH] 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 2 --
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 2 --
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 43 -------------------------------------------
3 files changed, 0 insertions(+), 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 1fcac38..e43f8db 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 @@
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 eb828a8..f6f42b3 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 @@
resultHolder.put(key, uuid, result);
playService.play(newMediaServerItem, deviceId, channelId, ((code, msg, data) -> {
- System.out.println("controller鏀跺埌鍥炶皟");
- System.out.println(JSON.toJSONString(data));
WVPResult<StreamContent> 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 5d04f10..8e35d04 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 @@
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) -> {
--
Gitblit v1.8.0