wvp-pro.git - Gitblit

			@@ -29,6 +29,7 @@
			import com.genersoft.iot.vmp.service.bean.SSRCInfo;
			import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
			import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
			import com.genersoft.iot.vmp.utils.DateUtil;
			import com.genersoft.iot.vmp.utils.SerializeUtils;
			import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
			import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
			@@ -49,7 +50,7 @@
			import javax.sip.message.Request;
			import javax.sip.message.Response;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.Instant;
			import java.util.Date;
			import java.util.List;
			import java.util.Vector;
			@@ -201,16 +202,16 @@

			Long startTime = null;
			Long stopTime = null;
			Date start = null;
			Date end = null;
			Instant start = null;
			Instant end = null;
			if (sdp.getTimeDescriptions(false) != null && sdp.getTimeDescriptions(false).size() > 0) {
			TimeDescriptionImpl timeDescription = (TimeDescriptionImpl)(sdp.getTimeDescriptions(false).get(0));
			TimeField startTimeFiled = (TimeField)timeDescription.getTime();
			startTime = startTimeFiled.getStartTime();
			stopTime = startTimeFiled.getStopTime();

			start = new Date(startTime*1000);
			end = new Date(stopTime*1000);
			start = Instant.ofEpochMilli(startTime*1000);
			end = Instant.ofEpochMilli(stopTime*1000);
			}
			// 获取支持的格式
			Vector mediaDescriptions = sdp.getMediaDescriptions(true);
			@@ -352,13 +353,12 @@
			sendRtpItem.setApp("rtp");
			if ("Playback".equals(sessionName)) {
			sendRtpItem.setPlayType(InviteStreamType.PLAYBACK);
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true);
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true, true);
			sendRtpItem.setStreamId(ssrcInfo.getStream());
			// 写入redis，超时时回复
			redisCatchStorage.updateSendRTPSever(sendRtpItem);
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, format.format(start),
			format.format(end), null, result -> {
			playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.formatter.format(start),
			DateUtil.formatter.format(end), null, result -> {
			if (result.getCode() != 0){
			logger.warn("录像回放失败");
			if (result.getEvent() != null) {
			@@ -394,7 +394,7 @@
			if (mediaServerItem.isRtpEnable()) {
			streamId = String.format("%s_%s", device.getDeviceId(), channelId);
			}
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true);
			SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true, false);
			sendRtpItem.setStreamId(ssrcInfo.getStream());
			// 写入redis，超时时回复
			redisCatchStorage.updateSendRTPSever(sendRtpItem);