guzijian / wvp-GB28181-pro · Commits

Commit 1aa347bd2b28b9677196c53c9c9c1ec7559fcae3

Authored by 648540858
1 parent 5313922f

zlm hook 优化

Inline Side-by-side
Showing 1 changed file with 5 additions and 16 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @1aa347b
... ... @@ -73,9 +73,6 @@ public class ZLMHttpHookListener {
73 73 private AudioBroadcastManager audioBroadcastManager;
74 74  
75 75 @Autowired
76   - private ZLMServerFactory zlmServerFactory;
77   -
78   - @Autowired
79 76 private IPlayService playService;
80 77  
81 78 @Autowired
... ... @@ -124,9 +121,6 @@ public class ZLMHttpHookListener {
124 121 private VideoStreamSessionManager sessionManager;
125 122  
126 123 @Autowired
127   - private AssistRESTfulUtils assistRESTfulUtils;
128   -
129   - @Autowired
130 124 private SSRCFactory ssrcFactory;
131 125  
132 126 @Qualifier("taskExecutor")
... ... @@ -147,7 +141,7 @@ public class ZLMHttpHookListener {
147 141  
148 142 taskExecutor.execute(() -> {
149 143 List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);
150   - if (subscribes != null && subscribes.size() > 0) {
  144 + if (subscribes != null && !subscribes.isEmpty()) {
151 145 for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
152 146 subscribe.response(null, param);
153 147 }
... ... @@ -166,7 +160,7 @@ public class ZLMHttpHookListener {
166 160 @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
167 161 public HookResult onPlay(@RequestBody OnPlayHookParam param) {
168 162 if (logger.isDebugEnabled()) {
169   - logger.debug("[ZLM HOOK] 播放鉴权：{}->{}" + param.getMediaServerId(), param);
  163 + logger.debug("[ZLM HOOK] 播放鉴权：{}->{}", param.getMediaServerId(), param);
170 164 }
171 165 String mediaServerId = param.getMediaServerId();
172 166  
... ... @@ -252,11 +246,7 @@ public class ZLMHttpHookListener {
252 246 taskExecutor.execute(() -> {
253 247 ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
254 248 if (subscribe != null) {
255   - if (mediaInfo != null) {
256   - subscribe.response(mediaInfo, param);
257   - } else {
258   - new HookResultForOnPublish(1, "zlm not register");
259   - }
  249 + subscribe.response(mediaInfo, param);
260 250 }
261 251 });
262 252  
... ... @@ -798,7 +788,7 @@ public class ZLMHttpHookListener {
798 788 logger.info("[ZLM HOOK] zlm 启动 " + zlmServerConfig.getGeneralMediaServerId());
799 789 taskExecutor.execute(() -> {
800 790 List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
801   - if (subscribes != null && subscribes.size() > 0) {
  791 + if (subscribes != null && !subscribes.isEmpty()) {
802 792 for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
803 793 subscribe.response(null, zlmServerConfig);
804 794 }
... ... @@ -847,12 +837,11 @@ public class ZLMHttpHookListener {
847 837 */
848 838 @ResponseBody
849 839 @PostMapping(value = "/on_rtp_server_timeout", produces = "application/json;charset=UTF-8")
850   - public HookResult onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam
  840 + public HookResult onRtpServerTimeout(@RequestBody OnRtpServerTimeoutHookParam
851 841 param) {
852 842 logger.info("[ZLM HOOK] rtpServer收流超时：{}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());
853 843  
854 844 taskExecutor.execute(() -> {
855   - JSONObject json = (JSONObject) JSON.toJSON(param);
856 845 List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
857 846 if (subscribes != null && !subscribes.isEmpty()) {
858 847 for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
... ...