修复回放、停止预览bug，增加ZLM hook监听，长时间无人观看，停止摄像头推流。需开启ZLM的hook并配置url

songww

2020-05-14 805fa42a2c010d92b1c8fc29a60d32fd99fb4ea3

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

@@ -3,8 +3,11 @@
import java.text.ParseException;



import javax.sip.ClientTransaction;

import javax.sip.Dialog;

import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import javax.sip.TransactionDoesNotExistException;

import javax.sip.header.ViaHeader;

import javax.sip.message.Request;



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

@@ -13,10 +16,10 @@
import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.SipLayer;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

import com.genersoft.iot.vmp.gb28181.utils.DateUtil;

import com.genersoft.iot.vmp.gb28181.utils.SsrcUtil;



/**    

 * @Description:设备能力接口，用于定义设备的控制、查询能力   

@@ -34,6 +37,9 @@
   

   @Autowired

   private SipLayer sipLayer;

	
   @Autowired

   private VideoStreamSessionManager streamSession;

   

   /**

    * 云台方向放控制，使用配置文件中的默认镜头移动速度

@@ -135,7 +141,8 @@
   public String playStreamCmd(Device device, String channelId) {

      try {

         

         String ssrc = SsrcUtil.getPlaySsrc();

         String ssrc = streamSession.createPlaySsrc();

         String transport = device.getTransport();

         //

         StringBuffer content = new StringBuffer(200);

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

@@ -143,25 +150,26 @@
           content.append("s=Play\r\n");

           content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");

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

           if(device.getTransport().equals("TCP")) {

           if("TCP".equals(transport)) {

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

         }

           if(device.getTransport().equals("UDP")) {

           if("UDP".equals(transport)) {

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

         }

           content.append("a=sendrecv\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(device.getTransport().equals("TCP")){

           if("TCP".equals(transport)){

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

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

           }

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

           

           Request request = headerProvider.createInviteRequest(device, content.toString(), null, "live", null);

           Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "live", null);

   

           transmitRequest(device, request);

           ClientTransaction transaction = transmitRequest(device, request);

           streamSession.put(ssrc, transaction);

         return ssrc;

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -181,13 +189,13 @@
   public String playbackStreamCmd(Device device, String channelId, String startTime, String endTime) {

      try {

         

         String ssrc = SsrcUtil.getPlayBackSsrc();

         String ssrc = streamSession.createPlayBackSsrc();

         //

         StringBuffer content = new StringBuffer(200);

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

           content.append("o="+device.getDeviceId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

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

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

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

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

           content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");

           content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");

           if(device.getTransport().equals("TCP")) {

@@ -206,13 +214,50 @@
           }

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

           

           Request request = headerProvider.createInviteRequest(device, content.toString(), null, "live", null);

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "playback", null);

   

           transmitRequest(device, request);

           ClientTransaction transaction = transmitRequest(device, request);

           streamSession.put(ssrc, transaction);

         return ssrc;

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return null;

      }

   }

	
   /**

    * 视频流停止

    * 
    * @param device  视频设备

    * @param channelId  预览通道

    */

   @Override

   public void streamByeCmd(String ssrc) {

		
      try {

         ClientTransaction transaction = streamSession.get(ssrc);

         if (transaction == null) {

            return;

         }

			
         Dialog dialog = transaction.getDialog();

         if (dialog == null) {

            return;

         }

         Request byeRequest = dialog.createRequest(Request.BYE);

         ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

         String protocol = viaHeader.getTransport().toUpperCase();

         ClientTransaction clientTransaction = null;

         if("TCP".equals(protocol)) {

            clientTransaction = sipLayer.getTcpSipProvider().getNewClientTransaction(byeRequest);

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

            clientTransaction = sipLayer.getUdpSipProvider().getNewClientTransaction(byeRequest);

         }

         dialog.sendRequest(clientTransaction);

      } catch (TransactionDoesNotExistException e) {

         e.printStackTrace();

      } catch (SipException e) {

         e.printStackTrace();

      }

   }



@@ -435,16 +480,15 @@
      return false;

   }

   

   private void transmitRequest(Device device, Request request) throws SipException {

   private ClientTransaction transmitRequest(Device device, Request request) throws SipException {

      ClientTransaction clientTransaction = null;

      if(device.getTransport().equals("TCP")) {

      if("TCP".equals(device.getTransport())) {

         clientTransaction = sipLayer.getTcpSipProvider().getNewClientTransaction(request);

         //sipLayer.getTcpSipProvider().sendRequest(request);

      } else if(device.getTransport().equals("UDP")) {

      } else if("UDP".equals(device.getTransport())) {

         clientTransaction = sipLayer.getUdpSipProvider().getNewClientTransaction(request);

         //sipLayer.getUdpSipProvider().sendRequest(request);

      }

      clientTransaction.sendRequest();

      return clientTransaction;

   }



}