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

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

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

@@ -38,10 +38,15 @@
   @Autowired
   private ZLMRESTfulUtils zlmresTfulUtils;

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

   @GetMapping("/play/{deviceId}/{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);

@@ -103,7 +108,7 @@
            }
         }
      } else {
         String flv = storager.getMediaInfo().getLocalIP() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
         String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
               + streamId + ".flv";
         streamInfo.setFlv("http://" + flv);
         streamInfo.setWs_flv("ws://" + flv);
@@ -146,3 +151,4 @@
      }
   }
}