Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-17 32c73ff595c9939b342017ffbd8c86bc16877ba6

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

@@ -22,6 +22,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;

import com.genersoft.iot.vmp.media.zlm.dto.hook.*;

import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;

@@ -124,14 +125,12 @@
    @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")

    public HookResult onServerKeepalive(@RequestBody OnServerKeepaliveHookParam param) {



//        logger.info("[ZLM HOOK] 收到zlm心跳：" + param.getMediaServerId());



        taskExecutor.execute(() -> {

            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);

            JSONObject json = (JSONObject) JSON.toJSON(param);

            if (subscribes != null && subscribes.size() > 0) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, json);

                    subscribe.response(null, param);

                }

            }

        });

@@ -158,7 +157,7 @@
            if (subscribe != null) {

                MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

                if (mediaInfo != null) {

                    subscribe.response(mediaInfo, json);

                    subscribe.response(mediaInfo, param);

                }

            }

        });

@@ -226,15 +225,12 @@




        HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();

        if (!"rtp".equals(param.getApp())) {

            result.setEnable_audio(true);

        }



        result.setEnable_audio(true);

        taskExecutor.execute(() -> {

            ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);

            if (subscribe != null) {

                if (mediaInfo != null) {

                    subscribe.response(mediaInfo, json);

                    subscribe.response(mediaInfo, param);

                } else {

                    new HookResultForOnPublish(1, "zlm not register");

                }

@@ -257,7 +253,6 @@
            // 如果是录像下载就设置视频间隔十秒

            if (ssrcTransactionForAll.get(0).getType() == InviteSessionType.DOWNLOAD) {

                result.setMp4_max_second(10);

                result.setEnable_audio(true);

                result.setEnable_mp4(true);

            }

        }

@@ -279,6 +274,14 @@
                }

            }

        }

        if (param.getApp().equalsIgnoreCase("rtp")) {

            String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_" + param.getStream();

            OtherRtpSendInfo otherRtpSendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(receiveKey);

            if (otherRtpSendInfo != null) {

                result.setEnable_mp4(true);

            }

        }

        logger.info("[ZLM HOOK]推流鉴权 响应：{}->{}->>>>{}", param.getMediaServerId(), param, result);

        return result;

    }



@@ -306,7 +309,7 @@
                return;

            }

            if (subscribe != null) {

                subscribe.response(mediaInfo, json);

                subscribe.response(mediaInfo, param);

            }



            List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();

@@ -386,7 +389,9 @@
                        }

                        GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                        if (gbStream != null) {

                            eventPublisher.catalogEventPublishForStream(null, gbStream, param.isRegist()?CatalogEvent.ON:CatalogEvent.OFF);

                            if (userSetting.isUsePushingAsStatus()) {

                                eventPublisher.catalogEventPublishForStream(null, gbStream, param.isRegist()?CatalogEvent.ON:CatalogEvent.OFF);

                            }

                        }

                        if (type != null) {

                            // 发送流变化redis消息

@@ -446,8 +451,6 @@
        if ("rtp".equals(param.getApp())) {

            ret.put("close", userSetting.getStreamOnDemand());

            // 国标流， 点播/录像回放/录像下载

//            StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(param.getStream());



            InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());

            // 点播

            if (inviteInfo != null) {

@@ -470,13 +473,22 @@
                            }

                            redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),

                                    sendRtpItem.getCallId(), sendRtpItem.getStreamId());

                            if (InviteStreamType.PUSH == sendRtpItem.getPlayType()) {

                                MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,

                                        sendRtpItem.getApp(), sendRtpItem.getStreamId(), sendRtpItem.getChannelId(),

                                        sendRtpItem.getPlatformId(), parentPlatform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());

                                messageForPushChannel.setPlatFormIndex(parentPlatform.getId());

                                redisCatchStorage.sendPlatformStopPlayMsg(messageForPushChannel);

                            }

                        }

                    }

                }

                Device device = deviceService.getDevice(inviteInfo.getDeviceId());

                if (device != null) {

                    try {

                        if (inviteStreamService.getInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream()) != null) {

                        InviteInfo info = inviteStreamService.getInviteInfo(inviteInfo.getType(),

                                inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream());

                        if (info != null) {

                            cmder.streamByeCmd(device, inviteInfo.getChannelId(),

                                    inviteInfo.getStream(), null);

                        }

@@ -496,13 +508,13 @@
            // 拉流代理

            StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());

            if (streamProxyItem != null) {

                if (streamProxyItem.isEnable_remove_none_reader()) {

                if (streamProxyItem.isEnableRemoveNoneReader()) {

                    // 无人观看自动移除

                    ret.put("close", true);

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

                    String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrc_url();

                    String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrcUrl();

                    logger.info("[{}/{}]<-[{}] 拉流代理无人观看已经移除", param.getApp(), param.getStream(), url);

                } else if (streamProxyItem.isEnable_disable_none_reader()) {

                } else if (streamProxyItem.isEnableDisableNoneReader()) {

                    // 无人观看停用

                    ret.put("close", true);

                    // 修改数据

@@ -513,7 +525,7 @@
                }

                return ret;

            }

            // 推流具有主动性，暂时不做处理

            // TODO 推流具有主动性，暂时不做处理

//         StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);

//         if (streamPushItem != null) {

//            // TODO 发送停止

@@ -578,7 +590,7 @@
            resultHolder.put(key, uuid, result);



            if (!exist) {

                playService.play(mediaInfo, deviceId, channelId, (code, message, data) -> {

                playService.play(mediaInfo, deviceId, channelId, null, (code, message, data) -> {

                    msg.setData(new HookResult(code, message));

                    resultHolder.invokeResult(msg);

                });

@@ -587,7 +599,7 @@
        } else {

            // 拉流代理

            StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());

            if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {

            if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnableDisableNoneReader()) {

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

            }

            DeferredResult<HookResult> result = new DeferredResult<>();

@@ -611,7 +623,7 @@
            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);

            if (subscribes != null && subscribes.size() > 0) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, jsonObject);

                    subscribe.response(null, zlmServerConfig);

                }

            }

            mediaServerService.zlmServerOnline(zlmServerConfig);

@@ -666,7 +678,7 @@
            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);

            if (subscribes != null && subscribes.size() > 0) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, json);

                    subscribe.response(null, param);

                }

            }

        });