wvp-pro.git - Gitblit

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

			import com.genersoft.iot.vmp.common.VideoManagerConstants;
			import com.alibaba.fastjson2.JSON;
			import com.alibaba.fastjson2.JSONObject;
			import com.genersoft.iot.vmp.common.StreamInfo;
			import com.genersoft.iot.vmp.common.VideoManagerConstants;
			import com.genersoft.iot.vmp.conf.DynamicTask;
			import com.genersoft.iot.vmp.conf.SipConfig;
			import com.genersoft.iot.vmp.conf.UserSetting;
			@@ -428,7 +430,7 @@
			Map<String, Object> param = new HashMap<>(12);
			param.put("vhost","__defaultVhost__");
			param.put("app",sendRtpItem.getApp());
			param.put("stream",sendRtpItem.getStreamId());
			param.put("stream",sendRtpItem.getStream());
			param.put("ssrc", sendRtpItem.getSsrc());
			if (!sendRtpItem.isTcpActive()) {
			param.put("dst_url",sendRtpItem.getIp());
			@@ -444,7 +446,7 @@
			// 开启rtcp保活
			param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
			}
			JSONObject startSendRtpStreamResult = zlmServerFactory.startSendRtpStreamForPassive(mediaInfo, param);
			JSONObject startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
			if (startSendRtpStreamResult != null) {
			startSendRtpStreamHand(evt, sendRtpItem, null, startSendRtpStreamResult, param, callIdHeader);
			}

			@@ -720,7 +720,7 @@

			if (!exist) {
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaInfo, param.getStream(), null,
			device.isSsrcCheck(), true, 0, false, device.getStreamModeForParam());
			device.isSsrcCheck(), true, 0, false, false, device.getStreamModeForParam());
			playService.playBack(mediaInfo, ssrcInfo, deviceId, channelId, startTime, endTime, (code, message, data) -> {
			msg.setData(new HookResult(code, message));
			resultHolder.invokeResult(msg);

			@@ -234,7 +234,7 @@
			sendRtpItem.setReceiveStream(stream + "_talk");

			String callId = SipUtils.getNewCallId();
			int port = sendRtpPortManager.getNextPort(mediaServerItem.getId());
			int port = sendRtpPortManager.getNextPort(mediaServerItem);
			//端口获取失败的ssrcInfo 没有必要发送点播指令
			if (port <= 0) {
			logger.info("[语音对讲] 端口分配异常，deviceId={},channelId={}", device.getDeviceId(), channelId);

	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史