648540858
2021-08-08 f4aa3e0ee8c988c0d7535ad1c76e68e23e400194
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -346,6 +346,10 @@
               redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
            }
         }
         MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
         if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) {
            ret.put("close", false);
         }
         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
      }else {
         JSONObject ret = new JSONObject();
@@ -371,18 +375,18 @@
      if (userSetup.isAutoApplyPlay() && mediaInfo != null) {
         String app = json.getString("app");
         String streamId = json.getString("stream");
         if ("rtp".equals(app) && streamId.contains("gb_play") ) {
            String[] s = streamId.split("_");
            if (s.length == 4) {
               String deviceId = s[2];
               String channelId = s[3];
         if ("rtp".equals(app)) {
            String[] s = streamId.split("/");
            if (s.length == 2) {
               String deviceId = s[0];
               String channelId = s[1];
               Device device = storager.queryVideoDevice(deviceId);
               if (device != null) {
                  UUID uuid = UUID.randomUUID();
                  SSRCInfo ssrcInfo;
                  String streamId2 = null;
                  if (mediaInfo.isRtpEnable()) {
                     streamId2 = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
                     streamId2 = String.format("%s/%s", device.getDeviceId(), channelId);
                  }
                  ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2);
                  cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {