wvp-pro.git - Gitblit

			@@ -289,7 +289,7 @@
			@ResponseBody
			@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
			public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {

			System.out.println(JSON.toJSONString(param));
			if (param.isRegist()) {
			logger.info("[ZLM HOOK] 流注册, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
			} else {
			@@ -311,13 +311,11 @@

			List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
			// TODO 重构此处逻辑
			boolean isPush = false;
			if (param.isRegist()) {
			// 处理流注册的鉴权信息
			if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
			\|\| param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
			\|\| param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
			isPush = true;
			StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
			if (streamAuthorityInfo == null) {
			streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
			@@ -331,7 +329,7 @@
			redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
			}

			if ("rtsp".equals(param.getSchema())) {
			if ("rtmp".equals(param.getSchema())) {
			// 更新流媒体负载信息
			if (param.isRegist()) {
			mediaServerService.addCount(param.getMediaServerId());
			@@ -363,6 +361,8 @@
			StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
			param.getApp(), param.getStream(), tracks, callId);
			param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
			// 如果是拉流代理产生的，不需要写入推流

			redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
			if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
			\|\| param.getOriginType() == OriginType.RTMP_PUSH.ordinal()

			@@ -418,7 +418,7 @@
			}
			final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
			dynamicTask.stop(zlmKeepaliveKey);
			dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (Math.getExponent(serverItem.getHookAliveInterval()) + 5) * 1000);
			dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
			publisher.zlmOnlineEventPublish(serverItem.getId());

			logger.info("[ZLM] 连接成功 {} - {}:{} ",

	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史