wvp-pro.git - Gitblit

			@@ -35,8 +35,10 @@
			import com.genersoft.iot.vmp.utils.DateUtil;
			import gov.nist.javax.sdp.TimeDescriptionImpl;
			import gov.nist.javax.sdp.fields.TimeField;
			import gov.nist.javax.sdp.fields.URIField;
			import gov.nist.javax.sip.message.SIPRequest;
			import gov.nist.javax.sip.message.SIPResponse;
			import org.apache.commons.lang3.StringUtils;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.InitializingBean;
			@@ -147,8 +149,21 @@
			public void process(RequestEvent evt) {
			// Invite Request消息实现，此消息一般为级联消息，上级给下级发送请求视频指令
			try {
			SIPRequest request = (SIPRequest) evt.getRequest();
			String channelId = SipUtils.getChannelIdFromRequest(request);
			SIPRequest request = (SIPRequest)evt.getRequest();
			String channelIdFromSub = SipUtils.getChannelIdFromRequest(request);

			// 解析sdp消息, 使用jainsip 自带的sdp解析方式
			String contentString = new String(request.getRawContent());
			Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
			SessionDescription sdp = gb28181Sdp.getBaseSdb();
			String sessionName = sdp.getSessionName().getValue();
			String channelIdFromSdp = null;
			if(StringUtils.equalsIgnoreCase("Playback", sessionName)){
			URIField uriField = (URIField)sdp.getURI();
			channelIdFromSdp = uriField.getURI().split(":")[0];
			}
			final String channelId = StringUtils.isNotBlank(channelIdFromSdp) ? channelIdFromSdp : channelIdFromSub;

			String requesterId = SipUtils.getUserIdFromFromHeader(request);
			CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
			if (requesterId == null \|\| channelId == null) {
			@@ -257,12 +272,6 @@
			}
			return;
			}
			// 解析sdp消息, 使用jainsip 自带的sdp解析方式
			String contentString = new String(request.getRawContent());

			Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
			SessionDescription sdp = gb28181Sdp.getBaseSdb();
			String sessionName = sdp.getSessionName().getValue();

			Long startTime = null;
			Long stopTime = null;
			@@ -489,6 +498,7 @@
			String endTimeStr = DateUtil.urlFormatter.format(end);
			String stream = device.getDeviceId() + "_" + channelId + "_" + startTimeStr + "_" + endTimeStr;
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, stream, null, device.isSsrcCheck(), true, 0,false, false, device.getStreamModeForParam());
			sendRtpItem.setStream(stream);
			// 写入redis，超时时回复
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.formatter.format(start),
			@@ -537,7 +547,7 @@
			} else {
			sendRtpItem.setPlayType(InviteStreamType.PLAY);
			String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
			sendRtpItem.setStreamId(streamId);
			sendRtpItem.setStream(streamId);
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			SSRCInfo ssrcInfo = playService.play(mediaServerItem, device.getDeviceId(), channelId, ssrc, ((code, msg, data) -> {
			if (code == InviteErrorCode.SUCCESS.getCode()) {
			@@ -968,7 +978,10 @@
			}
			if (device != null) {
			logger.info("收到设备" + requesterId + "的语音广播Invite请求");
			String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId() + broadcastCatch.getChannelId();
			String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId();
			if (!SipUtils.isFrontEnd(device.getDeviceId())) {
			key += broadcastCatch.getChannelId();
			}
			dynamicTask.stop(key);
			try {
			responseAck(request, Response.TRYING);
			@@ -978,8 +991,6 @@
			return;
			}
			String contentString = new String(request.getRawContent());
			// jainSip不支持y=字段，移除移除以解析。
			String ssrc = "0000000404";

			try {
			Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
			@@ -996,7 +1007,7 @@
			Media media = mediaDescription.getMedia();

			Vector mediaFormats = media.getMediaFormats(false);
			if (mediaFormats.contains("8")) {
			// if (mediaFormats.contains("8")) {
			port = media.getMediaPort();
			String protocol = media.getProtocol();
			// 区分TCP发流还是udp，当前默认udp
			@@ -1012,7 +1023,7 @@
			}
			}
			break;
			}
			// }
			}
			if (port == -1) {
			logger.info("不支持的媒体格式，返回415");
			@@ -1027,7 +1038,7 @@
			return;
			}
			String addressStr = sdp.getOrigin().getAddress();
			logger.info("设备{}请求语音流，地址：{}:{}，ssrc：{}, {}", requesterId, addressStr, port, ssrc,
			logger.info("设备{}请求语音流，地址：{}:{}，ssrc：{}, {}", requesterId, addressStr, port, gb28181Sdp.getSsrc(),
			mediaTransmissionTCP ? (tcpActive ? "TCP主动" : "TCP被动") : "UDP");

			MediaServerItem mediaServerItem = broadcastCatch.getMediaServerItem();
			@@ -1041,11 +1052,11 @@
			}
			return;
			}
			logger.info("设备{}请求语音流，收流地址：{}:{}，ssrc：{}, {}, 对讲方式：{}", requesterId, addressStr, port, ssrc,
			logger.info("设备{}请求语音流，收流地址：{}:{}，ssrc：{}, {}, 对讲方式：{}", requesterId, addressStr, port, gb28181Sdp.getSsrc(),
			mediaTransmissionTCP ? (tcpActive ? "TCP主动" : "TCP被动") : "UDP", sdp.getSessionName().getValue());
			CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);

			SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
			SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, gb28181Sdp.getSsrc(), requesterId,
			device.getDeviceId(), broadcastCatch.getChannelId(),
			mediaTransmissionTCP, false);

			@@ -1081,7 +1092,7 @@

			Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, broadcastCatch.getApp(), broadcastCatch.getStream());
			if (streamReady) {
			sendOk(device, sendRtpItem, sdp, request, mediaServerItem, mediaTransmissionTCP, ssrc);
			sendOk(device, sendRtpItem, sdp, request, mediaServerItem, mediaTransmissionTCP, gb28181Sdp.getSsrc());
			} else {
			logger.warn("[语音通话]，未发现待推送的流,app={},stream={}", broadcastCatch.getApp(), broadcastCatch.getStream());
			try {