增加强制不查询编码信息配置

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

 src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java

@@ -1,5 +1,9 @@
package com.genersoft.iot.vmp.vmanager.playback;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +34,10 @@
   
   @Autowired
   private IVideoManagerStorager storager;
	

   @Autowired
   private ZLMRESTfulUtils zlmresTfulUtils;

   @GetMapping("/playback/{deviceId}/{channelId}")
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId, String startTime,  String endTime){
      
@@ -43,25 +50,81 @@
         logger.warn(log);
         return new ResponseEntity<String>(log,HttpStatus.BAD_REQUEST);
      }
		

      Device device = storager.queryVideoDevice(deviceId);
      String ssrc = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
      StreamInfo streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);

      if (streamInfo != null) {
         cmder.streamByeCmd(streamInfo.getSsrc());
      }

//      }else {
//         String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
//         JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
//         if (rtpInfo.getBoolean("exist")) {
//            return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
//         }else {
//            storager.stopPlayback(streamInfo);
//            streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
//         }
//      }
      streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);

      String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
      
      if (logger.isDebugEnabled()) {
         logger.debug("设备回放 API调用，ssrc："+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
         logger.debug("设备回放 API调用，ssrc：" + streamInfo.getSsrc() + ",ZLMedia streamId:" + streamId);
      }
		
      if(ssrc!=null) {
         JSONObject json = new JSONObject();
         json.put("ssrc", ssrc);
         return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
      // 等待推流, TODO 默认超时15s
      boolean lockFlag = true;
      boolean rtpPushed = false;
      long lockStartTime = System.currentTimeMillis();
      JSONObject rtpInfo = null;

      while (lockFlag) {
         try {
            if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
               storager.stopPlayback(streamInfo);
               logger.info("播放等待超时");
               return new ResponseEntity<String>("timeout",HttpStatus.OK);
            }else {
               streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
               if (!rtpPushed) {
                  logger.info("查询RTP推流信息...");
                  rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
               }
               if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null){
                  logger.info("查询流编码信息："+streamInfo.getFlv());
                  rtpPushed = true;
                  Thread.sleep(2000);
                  JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
                  if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
                     lockFlag = false;
                     logger.info("流编码信息已获取");
                     JSONArray tracks = mediaInfo.getJSONArray("tracks");
                     streamInfo.setTracks(tracks);
                     storager.startPlayback(streamInfo);
                  }else {
                     logger.info("流编码信息未获取，2秒后重试...");
                  }
               }else {
                  Thread.sleep(2000);
                  continue;
               }
            }
         } catch (InterruptedException e) {
            e.printStackTrace();
         }
      }
      if(streamInfo!=null) {
         return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
      } else {
         logger.warn("设备回放API调用失败！");
         return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
      }
   }
   
   @PostMapping("/playback/{ssrc}/stop")
   @RequestMapping("/playback/{ssrc}/stop")
   public ResponseEntity<String> playStop(@PathVariable String ssrc){
      
      cmder.streamByeCmd(ssrc);