优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。

648540858

2022-03-25 7d9cc96ef54399795deb5b7fc7682e6323dc1202

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -428,7 +428,7 @@
            errorEvent.response(e);

         }), e ->{

            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

            streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);

         });



@@ -537,7 +537,7 @@


           transmitRequest(device, request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

              streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction());

              streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.playback);

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);

         });

         if (inviteStreamCallback != null) {

@@ -558,8 +558,9 @@
    * @param downloadSpeed 下载倍速参数

    */ 

   @Override

   public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, String startTime, String endTime, String downloadSpeed, InviteStreamCallback event

         , SipSubscribe.Event errorEvent) {

   public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                          String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                          SipSubscribe.Event errorEvent) {

      try {

         logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());



@@ -571,8 +572,6 @@
           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

           content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "

               +DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");







         String streamMode = device.getStreamMode().toUpperCase();



@@ -639,15 +638,20 @@
         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

                  event.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

                  hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

                  subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

               });



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());

         if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

         }

           transmitRequest(device, request, errorEvent, okEvent->{

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.download);

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);

         });



           ClientTransaction transaction = transmitRequest(device, request, errorEvent);

           streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), transaction);

           streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), transaction);



      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -670,6 +674,7 @@
      try {

         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);

         ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);



         if (transaction == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);

            SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();

@@ -685,7 +690,12 @@
            if (stream == null) return;

            dialog = streamSession.getDialogByStream(deviceId, channelId, stream);

         }



         if (ssrcTransaction != null) {

            MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());

            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());

            mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());

            streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());

         }



         if (dialog == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", deviceId, channelId);

@@ -730,12 +740,6 @@


         dialog.sendRequest(clientTransaction);



         if (ssrcTransaction != null) {

            MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());

            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());

            mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());

            streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());

         }

      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

@@ -1120,8 +1124,9 @@
   @Override

   public boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         String charset = device.getCharset();

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         catalogXml.append("<Query>\r\n");

         catalogXml.append("<CmdType>DeviceStatus</CmdType>\r\n");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1153,7 +1158,8 @@
   public boolean deviceInfoQuery(Device device) {

      try {

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         catalogXml.append("<Query>\r\n");

         catalogXml.append("<CmdType>DeviceInfo</CmdType>\r\n");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1185,7 +1191,8 @@
   public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         catalogXml.append("<Query>\r\n");

         catalogXml.append("<CmdType>Catalog</CmdType>\r\n");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1224,7 +1231,8 @@
      }

      try {

         StringBuffer recordInfoXml = new StringBuffer(200);

         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         recordInfoXml.append("<Query>\r\n");

         recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");

         recordInfoXml.append("<SN>" + sn + "</SN>\r\n");

@@ -1396,7 +1404,8 @@
   public boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer mobilePostitionXml = new StringBuffer(200);

         mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         mobilePostitionXml.append("<Query>\r\n");

         mobilePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");

         mobilePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1431,7 +1440,8 @@
   public boolean mobilePositionSubscribe(Device device, int expires, int interval) {

      try {

         StringBuffer subscribePostitionXml = new StringBuffer(200);

         subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         subscribePostitionXml.append("<Query>\r\n");

         subscribePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");

         subscribePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1473,7 +1483,8 @@
   public boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Alarm</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1518,7 +1529,8 @@
   public boolean catalogSubscribe(Device device, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Catalog</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");