wvp-pro.git - Gitblit

			@@ -1,6 +1,7 @@
			package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;

			import com.alibaba.fastjson2.JSONObject;
			import com.genersoft.iot.vmp.common.StreamInfo;
			import com.genersoft.iot.vmp.conf.DynamicTask;
			import com.genersoft.iot.vmp.conf.UserSetting;
			import com.genersoft.iot.vmp.gb28181.bean.*;
			@@ -241,21 +242,8 @@
			// 解析sdp消息, 使用jainsip 自带的sdp解析方式
			String contentString = new String(request.getRawContent());

			// jainSip不支持y=字段，移除以解析。
			int ssrcIndex = contentString.indexOf("y=");
			// 检查是否有y字段
			String ssrcDefault = "0000000000";
			String ssrc;
			SessionDescription sdp;
			if (ssrcIndex >= 0) {
			//ssrc规定长度为10个字节，不取余下长度以避免后续还有“f=”字段
			ssrc = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
			String substring = contentString.substring(0, contentString.indexOf("y="));
			sdp = SdpFactory.getInstance().createSessionDescription(substring);
			} else {
			ssrc = ssrcDefault;
			sdp = SdpFactory.getInstance().createSessionDescription(contentString);
			}
			Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
			SessionDescription sdp = gb28181Sdp.getBaseSdb();
			String sessionName = sdp.getSessionName().getValue();

			Long startTime = null;
			@@ -317,7 +305,7 @@
			String username = sdp.getOrigin().getUsername();
			String addressStr = sdp.getConnection().getAddress();

			logger.info("[上级点播]用户：{}，通道：{}, 地址：{}:{}， ssrc：{}", username, channelId, addressStr, port, ssrc);

			Device device = null;
			// 通过 channel 和 gbStream 是否为null 值判断来源是直播流合适国标
			if (channel != null) {
			@@ -341,6 +329,26 @@
			}
			return;
			}

			String ssrc;
			if (gb28181Sdp.getSsrc() == null) {
			// 上级平台点播时不使用上级平台指定的ssrc，使用自定义的ssrc，参考国标文档-点播外域设备媒体流SSRC处理方式
			ssrc = "Play".equalsIgnoreCase(sessionName) ? ssrcFactory.getPlaySsrc(mediaServerItem.getId()) : ssrcFactory.getPlayBackSsrc(mediaServerItem.getId());
			logger.warn("[上级Invite] {} 平台：{}，通道：{}, 缺少 ssrc，补充为： {}", sessionName, username, channelId, ssrc);
			}else {
			ssrc = gb28181Sdp.getSsrc();
			}
			String streamTypeStr = null;
			if (mediaTransmissionTCP) {
			if (tcpActive) {
			streamTypeStr = "TCP-ACTIVE";
			}else {
			streamTypeStr = "TCP-PASSIVE";
			}
			}else {
			streamTypeStr = "UDP";
			}
			logger.info("[上级Invite] {}, 平台：{}，通道：{}, 收流地址：{}:{}，收流方式：{}, ssrc：{}", sessionName, username, channelId, addressStr, port, streamTypeStr, ssrc);
			SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
			device.getDeviceId(), channelId, mediaTransmissionTCP, platform.isRtcp());

			@@ -447,21 +455,17 @@
			});
			} else {
			sendRtpItem.setPlayType(InviteStreamType.PLAY);
			SsrcTransaction playTransaction = sessionManager.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
			if (playTransaction != null) {
			Boolean streamReady = zlmrtpServerFactory.isStreamReady(mediaServerItem, "rtp", playTransaction.getStream());
			// SsrcTransaction playTransaction = sessionManager.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
			StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
			if (streamInfo != null) {
			Boolean streamReady = zlmrtpServerFactory.isStreamReady(mediaServerItem, streamInfo.getApp(), streamInfo.getStream());
			if (!streamReady) {
			boolean hasRtpServer = mediaServerService.checkRtpServer(mediaServerItem, "rtp", playTransaction.getStream());
			if (hasRtpServer) {
			logger.info("[上级点播]已经开启rtpServer但是尚未收到流，开启监听流的到来");
			HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", playTransaction.getStream(), true, "rtsp", mediaServerItem.getId());
			zlmHttpHookSubscribe.addSubscribe(hookSubscribe, hookEvent);
			}else {
			playTransaction = null;
			}
			redisCatchStorage.stopPlay(streamInfo);
			storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
			streamInfo = null;
			}
			}
			if (playTransaction == null) {
			if (streamInfo == null) {
			String streamId = null;
			if (mediaServerItem.isRtpEnable()) {
			streamId = String.format("%s_%s", device.getDeviceId(), channelId);
			@@ -469,7 +473,7 @@
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, null, device.isSsrcCheck(), false, 0, false, device.getStreamModeForParam());
			logger.info(JSONObject.toJSONString(ssrcInfo));
			sendRtpItem.setStreamId(ssrcInfo.getStream());
			sendRtpItem.setSsrc(ssrc.equals(ssrcDefault) ? ssrcInfo.getSsrc() : ssrc);
			sendRtpItem.setSsrc(ssrc);

			// 写入redis，超时时回复
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			@@ -480,13 +484,8 @@
			});
			} else {
			// 当前系统作为下级平台使用，当上级平台点播时不携带ssrc时，并且设备在当前系统中已经点播了。这个时候需要重新给生成一个ssrc，不使用默认的"0000000000"。
			if (ssrc.equals(ssrcDefault)) {
			ssrc = ssrcFactory.getPlaySsrc(mediaServerItem.getId());
			ssrcFactory.releaseSsrc(mediaServerItem.getId(), ssrc);
			sendRtpItem.setSsrc(ssrc);
			}

			sendRtpItem.setStreamId(playTransaction.getStream());
			sendRtpItem.setSsrc(ssrc);
			sendRtpItem.setStreamId(streamInfo.getStream());
			// 写入redis，超时时回复
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			JSONObject jsonObject = new JSONObject();
			@@ -496,11 +495,15 @@
			}
			}
			} else if (gbStream != null) {
			if(ssrc.equals(ssrcDefault))
			{
			ssrc = ssrcFactory.getPlaySsrc(mediaServerItem.getId());
			ssrcFactory.releaseSsrc(mediaServerItem.getId(), ssrc);

			String ssrc;
			if (gb28181Sdp.getSsrc() == null) {
			// 上级平台点播时不使用上级平台指定的ssrc，使用自定义的ssrc，参考国标文档-点播外域设备媒体流SSRC处理方式
			ssrc = "Play".equalsIgnoreCase(sessionName) ? ssrcFactory.getPlaySsrc(mediaServerItem.getId()) : ssrcFactory.getPlayBackSsrc(mediaServerItem.getId());
			}else {
			ssrc = gb28181Sdp.getSsrc();
			}

			if("push".equals(gbStream.getStreamType())) {
			if (streamPushItem != null && streamPushItem.isPushIng()) {
			// 推流状态