Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

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

@@ -82,13 +82,10 @@
   @ResponseBody

   @PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){

		
      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_flow_report API调用，参数：" + json.toString());

      }



      logger.debug("ZLM HOOK on_flow_report API调用，参数：" + json.toString());

      // TODO Auto-generated method stub



		
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

@@ -234,8 +231,13 @@
      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_shell_login API调用，参数：" + json.toString());

      }

      // TODO Auto-generated method stub

		
      // TODO 如果是带有rtpstream则开启按需拉流

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

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



      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);

      if (subscribe != null) subscribe.response(json);



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

@@ -261,6 +263,7 @@
      if ("rtp".equals(app) && !regist ) {

         if (streamInfo!=null){

            redisCatchStorage.stopPlay(streamInfo);

            storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());

         }else{

            streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

            redisCatchStorage.stopPlayback(streamInfo);

@@ -292,6 +295,7 @@
      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

      if (streamInfo!=null){

         redisCatchStorage.stopPlay(streamInfo);

         storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());

      }else{

         streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

         redisCatchStorage.stopPlayback(streamInfo);