wvp-pro.git - Gitblit

			@@ -17,9 +17,11 @@
			import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager;
			import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
			import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
			import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
			import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
			import com.genersoft.iot.vmp.service.IMediaServerService;
			import com.genersoft.iot.vmp.service.IPlayService;
			import com.genersoft.iot.vmp.service.IStreamProxyService;
			import com.genersoft.iot.vmp.service.IStreamPushService;
			import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
			import com.genersoft.iot.vmp.service.bean.SSRCInfo;
			@@ -65,6 +67,8 @@

			@Autowired
			private IStreamPushService streamPushService;
			@Autowired
			private IStreamProxyService streamProxyService;

			@Autowired
			private IRedisCatchStorage redisCatchStorage;
			@@ -120,9 +124,6 @@
			// Invite Request消息实现，此消息一般为级联消息，上级给下级发送请求视频指令
			try {
			Request request = evt.getRequest();
			SipURI sipUri = (SipURI) request.getRequestURI();
			//从subject读取channelId,不再从request-line读取。有些平台request-line是平台国标编码，不是设备国标编码。
			//String channelId = sipURI.getUser();
			String channelId = SipUtils.getChannelIdFromRequest(request);
			String requesterId = SipUtils.getUserIdFromFromHeader(request);
			CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
			@@ -145,6 +146,7 @@

			MediaServerItem mediaServerItem = null;
			StreamPushItem streamPushItem = null;
			StreamProxyItem proxyByAppAndStream =null;
			// 不是通道可能是直播流
			if (channel != null && gbStream == null) {
			if (channel.getStatus() == 0) {
			@@ -174,6 +176,13 @@
			if ("push".equals(gbStream.getStreamType())) {
			streamPushItem = streamPushService.getPush(gbStream.getApp(), gbStream.getStream());
			if (streamPushItem == null) {
			logger.info("[ app={}, stream={} ]找不到zlm {}，返回410", gbStream.getApp(), gbStream.getStream(), mediaServerId);
			responseAck(evt, Response.GONE);
			return;
			}
			}else if("proxy".equals(gbStream.getStreamType())){
			proxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(gbStream.getApp(), gbStream.getStream());
			if (proxyByAppAndStream == null) {
			logger.info("[ app={}, stream={} ]找不到zlm {}，返回410", gbStream.getApp(), gbStream.getStream(), mediaServerId);
			responseAck(evt, Response.GONE);
			return;
			@@ -419,14 +428,33 @@
			}
			}
			} else if (gbStream != null) {
			if (streamPushItem != null && streamPushItem.isPushIng()) {
			// 推流状态
			pushStream(evt, gbStream, streamPushItem, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			} else {
			// 未推流拉起
			notifyStreamOnline(evt, gbStream, streamPushItem, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			if("push".equals(gbStream.getStreamType())) {
			if (streamPushItem != null && streamPushItem.isPushIng()) {
			// 推流状态
			pushStream(evt, gbStream, streamPushItem, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			} else {
			// 未推流拉起
			notifyStreamOnline(evt, gbStream, streamPushItem, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			}
			}else if ("proxy".equals(gbStream.getStreamType())){
			if(null != proxyByAppAndStream &&proxyByAppAndStream.isStatus()){
			pushProxyStream(evt, gbStream, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			}else{
			//开启代理拉流
			boolean start1 = streamProxyService.start(gbStream.getApp(), gbStream.getStream());
			if(start1) {
			pushProxyStream(evt, gbStream, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			}else{
			//失败后通知
			notifyStreamOnline(evt, gbStream, null, platform, callIdHeader, mediaServerItem, port, tcpActive,
			mediaTransmissionTCP, channelId, addressStr, ssrc, requesterId);
			}
			}

			}
			}
			}
			@@ -445,7 +473,39 @@
			/**
			* 安排推流
			*/
			private void pushProxyStream(RequestEvent evt, GbStream gbStream, ParentPlatform platform,
			CallIdHeader callIdHeader, MediaServerItem mediaServerItem,
			int port, Boolean tcpActive, boolean mediaTransmissionTCP,
			String channelId, String addressStr, String ssrc, String requesterId) throws InvalidArgumentException, ParseException, SipException {
			Boolean streamReady = zlmrtpServerFactory.isStreamReady(mediaServerItem, gbStream.getApp(), gbStream.getStream());
			if (streamReady) {
			// 自平台内容
			SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
			gbStream.getApp(), gbStream.getStream(), channelId,
			mediaTransmissionTCP);

			if (sendRtpItem == null) {
			logger.warn("服务器端口资源不足");
			responseAck(evt, Response.BUSY_HERE);
			return;
			}
			if (tcpActive != null) {
			sendRtpItem.setTcpActive(tcpActive);
			}
			sendRtpItem.setPlayType(InviteStreamType.PUSH);
			// 写入redis，超时时回复
			sendRtpItem.setStatus(1);
			sendRtpItem.setCallId(callIdHeader.getCallId());
			byte[] dialogByteArray = SerializeUtils.serialize(evt.getDialog());
			sendRtpItem.setDialog(dialogByteArray);
			byte[] transactionByteArray = SerializeUtils.serialize(evt.getServerTransaction());
			sendRtpItem.setTransaction(transactionByteArray);
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			sendStreamAck(mediaServerItem, sendRtpItem, platform, evt);

			}

			}
			private void pushStream(RequestEvent evt, GbStream gbStream, StreamPushItem streamPushItem, ParentPlatform platform,
			CallIdHeader callIdHeader, MediaServerItem mediaServerItem,
			int port, Boolean tcpActive, boolean mediaTransmissionTCP,
			@@ -490,7 +550,6 @@
			}

			}

			/**
			* 通知流上线
			*/