增加对 需要扩展SDP的设备的单独设置

panlinlin

2020-12-28 00e61d9a80b5b013a75d1ce567dc997694577a45

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -7,6 +7,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.vmanager.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +28,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;

import javax.sip.message.Response;
import java.text.DecimalFormat;
import java.util.UUID;

@@ -62,24 +64,24 @@

      UUID uuid = UUID.randomUUID();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
      // 超时处理
      result.onTimeout(()->{
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setData("Timeout");
         resultHolder.invokeResult(msg);
      });

      // 录像查询以channelId作为deviceId查询
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);

      if (streamInfo == null) {
         // TODO playStreamCmd 超时处理
         // 发送点播消息
         cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
            logger.info("收到订阅消息： " + response.toJSONString());
            playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
         }, event -> {
            RequestMessage msg = new RequestMessage();
            msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
            Response response = event.getResponse();
            msg.setData(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
            resultHolder.invokeResult(msg);
         });
      } else {
         String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
         String streamId = streamInfo.getStreamId();
         JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
         if (rtpInfo.getBoolean("exist")) {
            RequestMessage msg = new RequestMessage();
@@ -88,31 +90,47 @@
            resultHolder.invokeResult(msg);
         } else {
            storager.stopPlay(streamInfo);
            // TODO playStreamCmd 超时处理
            cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
               logger.info("收到订阅消息： " + response.toJSONString());
               playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
            }, event -> {
               RequestMessage msg = new RequestMessage();
               msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
               Response response = event.getResponse();
               msg.setData(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
               resultHolder.invokeResult(msg);
            });
         }
      }

      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备点播超时，deviceId：%s ，channelId：%s", deviceId, channelId));
         // 释放rtpserver
         cmder.closeRTPServer(device, channelId);
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setData("Timeout");
         resultHolder.invokeResult(msg);
      });
      return result;
   }

   @PostMapping("/play/{ssrc}/stop")
   public ResponseEntity<String> playStop(@PathVariable String ssrc) {
   @PostMapping("/play/{streamId}/stop")
   public ResponseEntity<String> playStop(@PathVariable String streamId) {

      cmder.streamByeCmd(ssrc);
      StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
      cmder.streamByeCmd(streamId);
      StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
      if (streamInfo == null)
         return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
         return new ResponseEntity<String>("streamId not found", HttpStatus.OK);
      storager.stopPlay(streamInfo);
      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备预览停止API调用，ssrc：%s", ssrc));
         logger.debug(String.format("设备预览停止API调用，streamId：%s", streamId));
      }

      if (ssrc != null) {
      if (streamId != null) {
         JSONObject json = new JSONObject();
         json.put("ssrc", ssrc);
         json.put("streamId", streamId);
         return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
      } else {
         logger.warn("设备预览停止API调用失败！");
@@ -122,17 +140,16 @@

   /**
    * 将不是h264的视频通过ffmpeg 转码为h264 + aac
    * @param ssrc
    * @param streamId 流ID
    * @return
    */
   @PostMapping("/play/{ssrc}/convert")
   public ResponseEntity<String> playConvert(@PathVariable String ssrc) {
      StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
   @PostMapping("/play/{streamId}/convert")
   public ResponseEntity<String> playConvert(@PathVariable String streamId) {
      StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
      if (streamInfo == null) {
         logger.warn("视频转码API调用失败！, 视频流已经停止!");
         return new ResponseEntity<String>("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK);
      }
      String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
      JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
      if (!rtpInfo.getBoolean("exist")) {
         logger.warn("视频转码API调用失败！, 视频流已停止推流!");
@@ -141,7 +158,8 @@
         MediaServerConfig mediaInfo = storager.getMediaInfo();
         String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
               streamId );
         JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000");
         String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
         JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
         System.out.println(jsonObject);
         JSONObject result = new JSONObject();
         if (jsonObject != null && jsonObject.getInteger("code") == 0) {