648540858
2020-10-14 b55374c75a17c87b9ccb8d5c12abe188875af256
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;
@@ -41,18 +42,36 @@
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
      
      Device device = storager.queryVideoDevice(deviceId);
      StreamInfo streamInfo = cmder.playStreamCmd(device, channelId);
      StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
      if (streamInfo == null) {
         streamInfo = cmder.playStreamCmd(device, channelId);
      }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.stopPlay(streamInfo);
            streamInfo = cmder.playStreamCmd(device, channelId);
         }
      }
      String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
      // 等待推流, TODO 默认超时15s
      boolean lockFlag = true;
      long startTime = System.currentTimeMillis();
      String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
      // 判断推流是否存在
      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);
               if (rtpInfo == null){
               if (rtpInfo == null || !rtpInfo.getBoolean("exist") || storager.queryPlayByDevice(deviceId, channelId).getFlv() == null){
                  Thread.sleep(2000);
                  continue;
               }else {
                  lockFlag = false;
@@ -72,10 +91,8 @@
                     }
                  }
               };
            }
            Thread.sleep(200);
            streamInfo = storager.queryPlayByDevice(deviceId, channelId);
         } catch (InterruptedException e) {
            e.printStackTrace();
         }