Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-08 7e581e9d3a0e32be5e90e453f4283d70d895a634

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

@@ -182,11 +182,10 @@
   /**

   * 云台指令码计算 

   *

    * @param leftRight  镜头左移右移 0:停止 1:左移 2:右移

    * @param upDown     镜头上移下移 0:停止 1:上移 2:下移

    * @param inOut      镜头放大缩小 0:停止 1:缩小 2:放大

    * @param moveSpeed  镜头移动速度 默认 0XFF (0-255)

    * @param zoomSpeed  镜头缩放速度 默认 0X1 (0-255)

   * @param cmdCode      指令码

   * @param parameter1   数据1

   * @param parameter2   数据2

   * @param combineCode2   组合码2

    */

    public static String frontEndCmdString(int cmdCode, int parameter1, int parameter2, int combineCode2) {

      StringBuilder builder = new StringBuilder("A50F01");

@@ -233,7 +232,7 @@
         ptzXml.append("</Info>\r\n");

         ptzXml.append("</Control>\r\n");

         

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", null);

         

         transmitRequest(device, request);

         return true;

@@ -269,7 +268,7 @@
         ptzXml.append("</Info>\r\n");

         ptzXml.append("</Control>\r\n");

         

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", null);

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -324,30 +323,61 @@
         content.append("s=Play\r\n");

         content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");

         content.append("t=0 0\r\n");

         if("TCP-PASSIVE".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

         }else if ("TCP-ACTIVE".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

         }else if("UDP".equals(streamMode)) {

            content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");



         if (seniorSdp) {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:126 H264/90000\r\n");

            content.append("a=rtpmap:125 H264S/90000\r\n");

            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:99 MP4V-ES/90000\r\n");

            content.append("a=fmtp:99 profile-level-id=3\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

            if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

               content.append("a=setup:passive\r\n");

               content.append("a=connection:new\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

               content.append("a=setup:active\r\n");

               content.append("a=connection:new\r\n");

            }

         }else {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            if("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式

               content.append("a=setup:passive\r\n");

               content.append("a=recvonly\r\n");

               content.append("a=rtpmap:96 PS/90000\r\n");

               content.append("a=rtpmap:98 H264/90000\r\n");

               content.append("a=rtpmap:97 MPEG4/90000\r\n");

               if ("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式

                  content.append("a=setup:passive\r\n");

                  content.append("a=connection:new\r\n");

               } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

               } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

                  content.append("a=setup:active\r\n");

                  content.append("a=connection:new\r\n");

               }

            }

         }

         content.append("a=recvonly\r\n");

         content.append("a=fmtp:126 profile-level-id=42e01e\r\n");

         content.append("a=rtpmap:126 H264/90000\r\n");

         content.append("a=rtpmap:125 H264S/90000\r\n");

         content.append("a=fmtp:125 profile-level-id=42e01e\r\n");

         content.append("a=rtpmap:99 MP4V-ES/90000\r\n");

         content.append("a=fmtp:99 profile-level-id=3\r\n");

         content.append("a=rtpmap:98 H264/90000\r\n");

         content.append("a=rtpmap:97 MPEG4/90000\r\n");

         content.append("a=rtpmap:96 PS/90000\r\n");

         if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

            content.append("a=setup:passive\r\n");

            content.append("a=connection:new\r\n");

         }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

            content.append("a=setup:active\r\n");

            content.append("a=connection:new\r\n");

         }



         content.append("y="+ssrc+"\r\n");//ssrc



//         String fromTag = UUID.randomUUID().toString();

@@ -357,11 +387,7 @@


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

         streamSession.put(streamId, transaction);

         DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);

         if (deviceChannel != null) {

            deviceChannel.setStreamId(streamId);

            storager.updateChannel(device.getDeviceId(), deviceChannel);

         }







      } catch ( SipException | ParseException | InvalidArgumentException e) {

@@ -640,7 +666,7 @@
         catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

         

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaDeviceInfoBranch", "FromDeviceInfoTag", "ToDeviceInfoTag");

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaDeviceInfoBranch", "FromDeviceInfoTag", null);



         transmitRequest(device, request);

         

@@ -704,7 +730,6 @@
         recordInfoXml.append("</Query>\r\n");

         

         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", null);





         transmitRequest(device, request);

      } catch (SipException | ParseException | InvalidArgumentException e) {