更换播放器， 修正和优化sql脚本，

64850858

2021-07-14 e48ef997c03b49c8090970f5fbb29ce80b0ac6df

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

@@ -1,8 +1,6 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;



import java.text.ParseException;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



import javax.sip.*;

import javax.sip.address.SipURI;

@@ -10,11 +8,12 @@
import javax.sip.header.ViaHeader;

import javax.sip.message.Request;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.MediaServerConfig;

import com.genersoft.iot.vmp.conf.MediaConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;

import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;

@@ -26,7 +25,6 @@
import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.context.annotation.DependsOn;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Component;

@@ -82,17 +80,11 @@
   @Autowired

   private ZLMRESTfulUtils zlmresTfulUtils;



   @Value("${media.rtp.enable}")

   private boolean rtpEnable;

   @Autowired

   private MediaConfig mediaConfig;



   @Value("${media.seniorSdp}")

   private boolean seniorSdp;



   @Value("${media.autoApplyPlay}")

   private boolean autoApplyPlay;



   @Value("${userSettings.waitTrack}")

   private boolean waitTrack;

   @Autowired

   private UserSetup userSetup;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

@@ -353,21 +345,21 @@
      try {

         if (device == null) return;

         String ssrc = streamSession.createPlaySsrc();

         if (rtpEnable) {

         if (mediaConfig.isRtpEnable()) {

            streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         }else {

            streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         }

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

         MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         if (mediaInfo == null) {

            logger.warn("点播时发现ZLM尚未连接...");

            return;

         }

         String mediaPort = null;

         Integer mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId) + "";

         if (mediaConfig.isRtpEnable()) {

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId);

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }

@@ -379,7 +371,7 @@
         subscribeKey.put("regist", true);



         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, json->{

            if (waitTrack && json.getJSONArray("tracks") == null) return;

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(json);

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

         });

@@ -387,12 +379,12 @@
         StringBuffer content = new StringBuffer(200);

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

//         content.append("o=" + sipConfig.getSipId() + " 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");

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

         content.append("o="+"00000"+" 0 0 IN IP4 "+mediaInfo.getSdpIp()+"\r\n");

         content.append("s=Play\r\n");

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

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

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



         if (seniorSdp) {

         if (userSetup.isSeniorSdp()) {

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

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

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

@@ -470,7 +462,7 @@
   public void playbackStreamCmd(Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event

         , SipSubscribe.Event errorEvent) {

      try {

         MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         String ssrc = streamSession.createPlayBackSsrc();

         String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         // 添加订阅

@@ -478,9 +470,9 @@
         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", streamId);

         subscribeKey.put("regist", true);



         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, json->{

            if (json.getJSONArray("tracks") == null) return;

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(json);

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

         });

@@ -490,19 +482,19 @@
           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

           content.append("s=Playback\r\n");

           content.append("u="+channelId+":0\r\n");

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

           content.append("c=IN IP4 "+mediaInfo.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 mediaPort = null;

         Integer mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId) + "";

         if (mediaConfig.isRtpEnable()) {

            mediaPort = zlmrtpServerFactory.createRTPServer(streamId);

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }

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



         if (seniorSdp) {

         if (userSetup.isSeniorSdp()) {

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

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

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

@@ -1445,7 +1437,7 @@


   @Override

   public void closeRTPServer(Device device, String channelId) {

      if (rtpEnable) {

      if (mediaConfig.isRtpEnable()) {

         String streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         zlmrtpServerFactory.closeRTPServer(streamId);

      }