wvp-pro.git - Gitblit

			@@ -553,7 +553,6 @@
			if (sendRtpItem == null) {
			// TODO 可能数据错误，重新开启语音通道
			}else {
			String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
			MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
			logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());
			Map<String, Object> param = new HashMap<>(12);
			@@ -570,7 +569,7 @@
			if (sendRtpItem.isTcpActive()) {
			jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
			} else {
			param.put("is_udp", is_Udp);
			param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
			param.put("dst_url", sendRtpItem.getIp());
			param.put("dst_port", sendRtpItem.getPort());
			jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
			@@ -581,8 +580,8 @@
			}
			}else {
			// 开启语音对讲通道
			MediaServerItem mediaServerForMinimumLoad = mediaServerService.getMediaServerForMinimumLoad();
			playService.talk(mediaServerForMinimumLoad, device, channelId, (mediaServerItem, jsonObject)->{
			MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
			playService.talk(mediaServerItem, device, channelId, (mediaServer, jsonObject)->{
			System.out.println("开始推流");
			}, eventResult -> {
			System.out.println(eventResult.msg);
			@@ -644,7 +643,7 @@
			}
			}
			}
			if (!regist) {
			if (!regist ) {
			List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(stream);
			if (sendRtpItems.size() > 0) {
			for (SendRtpItem sendRtpItem : sendRtpItems) {
			@@ -657,7 +656,7 @@
			if (platform != null) {
			commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
			}else {
			if (sendRtpItem.isOnlyAudio()) {
			if ("talk".equals(app) && sendRtpItem.isOnlyAudio()) {
			AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
			if (device != null && audioBroadcastCatch != null) {
			// cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
			@@ -696,9 +695,12 @@
			String app = json.getString("app");
			JSONObject ret = new JSONObject();
			ret.put("code", 0);
			// 录像下载
			ret.put("close", userSetting.getStreamOnDemand());
			if ("rtp".equals(app)){
			ret.put("close", true);
			// 国标流，点播/录像回放/录像下载
			StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
			// 点播
			if (streamInfoForPlayCatch != null) {
			// 收到无人观看说明流也没有在往上级推送
			if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
			@@ -728,10 +730,15 @@

			redisCatchStorage.stopPlay(streamInfoForPlayCatch);
			storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
			}else{
			StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
			if (streamInfoForPlayBackCatch != null) {
			Device device = deviceService.queryDevice(streamInfoForPlayCatch.getDeviceID());
			return ret;
			}
			// 录像回放
			StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
			if (streamInfoForPlayBackCatch != null ) {
			if (streamInfoForPlayBackCatch.isPause()) {
			ret.put("close", false);
			}else {
			Device device = deviceService.queryDevice(streamInfoForPlayBackCatch.getDeviceID());
			if (device != null) {
			try {
			cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(),
			@@ -743,20 +750,19 @@
			}
			redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
			streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
			}else {
			StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
			// 进行录像下载时无人观看不断流
			if (streamInfoForDownload != null) {
			ret.put("close", false);
			}
			}
			return ret;
			}
			MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
			if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
			// 录像下载
			StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
			// 进行录像下载时无人观看不断流
			if (streamInfoForDownload != null) {
			ret.put("close", false);
			return ret;
			}
			return ret;
			}else {
			// 非国标流推流/拉流代理
			// 拉流代理
			StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
			if (streamProxyItem != null ) {
			if (streamProxyItem.isEnable_remove_none_reader()) {
			@@ -768,12 +774,21 @@
			}else if (streamProxyItem.isEnable_disable_none_reader()) {
			// 无人观看停用
			ret.put("close", true);
			// 修改数据
			streamProxyService.stop(app, streamId);
			}else {
			ret.put("close", false);
			}
			return ret;
			}
			return ret;
			// 推流具有主动性，暂时不做处理
			// StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
			// if (streamPushItem != null) {
			// // TODO 发送停止
			//
			// }
			}
			return ret;
			}

			/**
			@@ -788,19 +803,27 @@
			}
			String mediaServerId = json.getString("mediaServerId");
			MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
			if (userSetting.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
			if (userSetting.isAutoApplyPlay() && mediaInfo != null) {
			String app = json.getString("app");
			String streamId = json.getString("stream");
			if ("rtp".equals(app)) {
			String[] s = streamId.split("_");
			if (s.length == 2) {
			String deviceId = s[0];
			String channelId = s[1];
			Device device = redisCatchStorage.getDevice(deviceId);
			if (device != null) {
			playService.play(mediaInfo,deviceId, channelId, null, null, null);
			if (mediaInfo.isRtpEnable()) {
			String[] s = streamId.split("_");
			if (s.length == 2) {
			String deviceId = s[0];
			String channelId = s[1];
			Device device = redisCatchStorage.getDevice(deviceId);
			if (device != null) {
			playService.play(mediaInfo,deviceId, channelId, null, null, null);
			}
			}
			}
			}else {
			// 拉流代理
			StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
			if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {
			streamProxyService.start(app, streamId);
			}
			}
			}