wvp-pro.git - Gitblit

			@@ -9,9 +9,9 @@
			import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
			import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
			import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
			import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
			import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
			import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
			import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
			import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
			import com.genersoft.iot.vmp.media.zlm.dto.HookType;
			import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
			@@ -249,6 +249,7 @@
			String channelId = ssrcTransactionForAll.get(0).getChannelId();
			DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
			if (deviceChannel != null) {

			result.setEnable_audio(deviceChannel.isHasAudio());
			}
			// 如果是录像下载就设置视频间隔十秒
			@@ -257,6 +258,11 @@
			result.setEnable_audio(true);
			result.setEnable_mp4(true);
			}
			// 如果是talk对讲，则默认获取声音
			if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.talk) {
			result.setEnable_audio(true);
			}

			}
			return result;
			}
			@@ -282,12 +288,12 @@
			taskExecutor.execute(() -> {
			ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
			if (subscribe != null) {

			if (mediaInfo != null) {
			subscribe.response(mediaInfo, json);
			}
			}
			// 流消失移除redis play
			List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
			if (param.isRegist()) {
			if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
			\|\| param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
			@@ -361,41 +367,31 @@
			}
			}
			}else if ("talk".equals(param.getApp())){
			// 语音喊话推流 stream需要满足格式deviceId_channelId
			if (param.isRegist() && param.getStream().indexOf("_") > 0) {
			String[] streamArray = param.getStream().split("_");
			if (streamArray.length == 2) {
			String deviceId = streamArray[0];
			String channelId = streamArray[1];
			Device device = deviceService.getDevice(deviceId);
			if (device != null) {
			DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
			if (deviceChannel != null) {
			if (audioBroadcastManager.exit(deviceId, channelId)) {
			// 直接推流
			SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);
			if (sendRtpItem == null) {
			// TODO 可能数据错误，重新开启语音通道
			}else {
			logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());
			zlmrtpServerFactory.startSendRtp(mediaInfo, sendRtpItem);
			}
			}else {
			// 开启语音喊话通道
			MediaServerItem mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
			playService.talk(mediaServerItem, device, channelId, (mediaServer, jsonObject)->{
			System.out.println("开始推流");
			}, eventResult -> {
			System.out.println(eventResult.msg);
			}, ()->{
			System.out.println("超时");
			});
			}

			}
			}
			}
			}
			// 语音对讲推流 stream需要满足格式deviceId_channelId
			if (param.getStream().indexOf("_") > 0) {
			String[] streamArray = param.getStream().split("_");
			if (streamArray.length == 2) {
			String deviceId = streamArray[0];
			String channelId = streamArray[1];
			Device device = deviceService.getDevice(deviceId);
			if (device != null) {
			if (param.isRegist()) {
			if (audioBroadcastManager.exit(deviceId, channelId)) {
			playService.stopAudioBroadcast(deviceId, channelId);
			}
			// 开启语音对讲通道
			playService.talkCmd(device, channelId, mediaInfo, param.getStream(), (msg)->{
			logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);
			});
			}else {
			// 流注销
			playService.stopTalk(device, channelId, param.isRegist());
			}
			} else{
			logger.info("[语音对讲] 未找到设备：{}", deviceId);
			}
			}
			}

			}else{
			if (!"rtp".equals(param.getApp())){
			@@ -455,16 +451,21 @@
			ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
			Device device = deviceService.getDevice(platformId);

			try {

			if (platform != null) {
			commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
			try {
			commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
			} catch (SipException \| InvalidArgumentException \| ParseException e) {
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			} else {
			cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());
			try {
			cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());
			} catch (SipException \| InvalidArgumentException \| ParseException \|
			SsrcTransactionNotFoundException e) {
			logger.error("[命令发送失败] 发送BYE: {}", e.getMessage());
			}
			}
			} catch (SipException \| InvalidArgumentException \| ParseException \|
			SsrcTransactionNotFoundException e) {
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			}
			}
			}
			@@ -507,7 +508,7 @@
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
			sendRtpItem.getCallId(), sendRtpItem.getStreamId());
			sendRtpItem.getCallId(), sendRtpItem.getStream());
			}
			}
			}
			@@ -536,8 +537,7 @@
			try {
			cmder.streamByeCmd(device, streamInfoForPlayBackCatch.getChannelId(),
			streamInfoForPlayBackCatch.getStream(), null);
			} catch (InvalidArgumentException \| ParseException \| SipException \|
			SsrcTransactionNotFoundException e) {
			} catch (InvalidArgumentException \| ParseException \| SipException \| SsrcTransactionNotFoundException e) {
			logger.error("[无人观看]回放，发送BYE失败 {}", e.getMessage());
			}
			}
			@@ -553,6 +553,13 @@
			ret.put("close", false);
			return ret;
			}
			SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);
			if ("talk".equals(sendRtpItem.getApp())){
			ret.put("close", false);
			return ret;
			}
			}else if ("talk".equals(param.getApp()) \|\| "broadcast".equals(param.getApp())){
			ret.put("close", false);
			} else {
			// 非国标流推流/拉流代理
			// 拉流代理
			@@ -714,7 +721,7 @@
			logger.error("[命令发送失败] 国标级联发送BYE: {}", e.getMessage());
			}
			redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
			sendRtpItem.getCallId(), sendRtpItem.getStreamId());
			sendRtpItem.getCallId(), sendRtpItem.getStream());
			}
			}
			});