录像回放时不进行录像下载

648540858

2021-11-26 0cad0920c649f073bb64cae10bd9b573a1d78f4e

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -164,12 +164,20 @@
            subscribe.response(mediaInfo, json);

         }

      }

       String app = json.getString("app");

       String stream = json.getString("stream");

      StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);

      JSONObject ret = new JSONObject();

      // 录像回放时不进行录像下载

      if (streamInfo != null) {

         ret.put("enableMP4", false);

      }else {

         ret.put("enableMP4", userSetup.isRecordPushLive());

      }

      ret.put("code", 0);

      ret.put("msg", "success");

      ret.put("enableHls", true);

      ret.put("enableMP4", userSetup.isRecordPushLive());

      ret.put("enableRtxp", true);

      return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);

   }

   

@@ -358,14 +366,13 @@
      String mediaServerId = json.getString("mediaServerId");

      String streamId = json.getString("stream");

      String app = json.getString("app");



      // TODO 如果在给上级推流，也不停止。

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      if ("rtp".equals(app)){

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         ret.put("close", true);

         StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);

         if (streamInfoForPlayCatch != null) {

            // 如果在给上级推流，也不停止。

            if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {

               ret.put("close", false);

            } else {

@@ -378,6 +385,12 @@
            if (streamInfoForPlayBackCatch != null) {

               cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());

               redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);

            }else {

               StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId);

               // 进行录像下载时无人观看不断流

               if (streamInfoForDownload != null) {

                  ret.put("close", false);

               }

            }

         }

         MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

@@ -386,8 +399,6 @@
         }

         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      }else {

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);

         if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {

            ret.put("close", true);