Merge branch 'wvp-28181-2.0'

648540858

2022-11-23 12fa3b4c8da2af13a710400d64c9fe6d5d6b1e5e

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

@@ -531,7 +531,7 @@
//                                 cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);

                              }

                           }else {

                              cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());

                              cmder.streamByeCmd(device, null, null, sendRtpItem.getCallId());

                           }



                        }

@@ -646,6 +646,7 @@
               // 修改数据

               streamProxyService.stop(param.getApp(), param.getStream());

            }else {

               // 无人观看不做处理

               ret.put("close", false);

            }

            return ret;

@@ -771,7 +772,7 @@
   @ResponseBody

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

   public JSONObject onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam param){

      logger.info("[ZLM HOOK] rtpServer收流超时：{}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());

      logger.info("[ZLM HOOK] rtpServer rtp超时：{}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());



      JSONObject ret = new JSONObject();

      ret.put("code", 0);