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

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

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

@@ -7,6 +7,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -25,110 +26,129 @@
@RestController
@RequestMapping("/api")
public class PlayController {
	

   private final static Logger logger = LoggerFactory.getLogger(PlayController.class);
	

   @Autowired
   private SIPCommander cmder;
	

   @Autowired
   private IVideoManagerStorager storager;

   @Autowired
   private ZLMRESTfulUtils zlmresTfulUtils;
	

   @Value("${media.closeWaitRTPInfo}")
   private boolean closeWaitRTPInfo;

   @GetMapping("/play/{deviceId}/{channelId}")
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
		
   public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
   Integer getEncoding) {

      if (getEncoding == null) getEncoding = 0;
      getEncoding = closeWaitRTPInfo ?  0: getEncoding;
      Device device = storager.queryVideoDevice(deviceId);
      StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);

      if (streamInfo == null) {
         streamInfo = cmder.playStreamCmd(device, channelId);
      }else {
      } 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 {
            return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK);
         } else {
            storager.stopPlay(streamInfo);
            streamInfo = cmder.playStreamCmd(device, channelId);
         }

      }
      String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
      // 等待推流, TODO 默认超时15s
      // 等待推流, TODO 默认超时30s
      boolean lockFlag = true;
      boolean rtpPushed = false;
      long startTime = System.currentTimeMillis();
      JSONObject rtpInfo = null;

      while (lockFlag) {
         try {

            if (System.currentTimeMillis() - startTime > 15 * 1000) {
               storager.stopPlay(streamInfo);
               return new ResponseEntity<String>("timeout",HttpStatus.OK);
            }else {
               JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
               Boolean exist = rtpInfo.getBoolean("exist");
               if (rtpInfo == null || !rtpInfo.getBoolean("exist") || streamInfo.getFlv() != null){
                  continue;
               }else {
                  lockFlag = false;
                  streamInfo = storager.queryPlay(streamInfo);
                  // 获取媒体信息
                  JSONObject mediaList = zlmresTfulUtils.getMediaList("rtp", "rtmp");
                  if (mediaList.getInteger("code") == 0) {
                     JSONArray data = mediaList.getJSONArray("data");
                     if (data!= null) {
                        for (Object datum : data) {
                           JSONObject media = (JSONObject)datum;
                           if (streamId.equals(media.getString("stream"))) {
                              streamInfo.setTracks(media.getJSONArray("tracks"));
                              storager.startPlay(streamInfo);
                           }
                        }
                     }
      if (getEncoding == 1) {
         while (lockFlag) {
            try {
               if (System.currentTimeMillis() - startTime > 60 * 1000) {
                  storager.stopPlay(streamInfo);
                  logger.info("播放等待超时");
                  return new ResponseEntity<String>("timeout", HttpStatus.OK);
               } else {
                  streamInfo = storager.queryPlayByDevice(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.startPlay(streamInfo);
                     } else {
                        logger.info("流编码信息未获取，2秒后重试...");
                     }
                  } else {
                     Thread.sleep(2000);
                     continue;
                  }
               }
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
            Thread.sleep(200);
            streamInfo = storager.queryPlayByDevice(deviceId, channelId);
         } catch (InterruptedException e) {
            e.printStackTrace();
         }
      } else {
         String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
               + streamId + ".flv";
         streamInfo.setFlv("http://" + flv);
         streamInfo.setWs_flv("ws://" + flv);
         storager.startPlay(streamInfo);
      }

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备预览 API调用，deviceId：%s ，channelId：%s",deviceId, channelId));
         logger.debug("设备预览 API调用，ssrc："+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
         logger.debug(String.format("设备预览 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
         logger.debug("设备预览 API调用，ssrc：" + streamInfo.getSsrc() + ",ZLMedia streamId:"
               + Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
      }
		
      if(streamInfo!=null) {
         return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);

      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("/play/{ssrc}/stop")
   public ResponseEntity<String> playStop(@PathVariable String ssrc){
		
   public ResponseEntity<String> playStop(@PathVariable String ssrc) {

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

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