Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-09-11 88350873ee7632924cb135a450fef9f4d05c5306

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

old mode 100644
new mode 100755
@@ -30,6 +30,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.DateUtil;

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

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

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

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

import org.slf4j.Logger;

@@ -311,7 +312,10 @@
        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) {



            String receiveKeyForPS = VideoManagerConstants.WVP_OTHER_RECEIVE_PS_INFO + userSetting.getServerId() + "_" + param.getStream();

            OtherPsSendInfo otherPsSendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(receiveKeyForPS);

            if (otherRtpSendInfo != null || otherPsSendInfo != null) {

                result.setEnable_mp4(true);

            }

        }

@@ -696,7 +700,9 @@
                result.onTimeout(() -> {

                    logger.info("[ZLM HOOK] 预览流自动点播, 等待超时");

                    msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "点播超时"));

                    resultHolder.invokeResult(msg);

                    resultHolder.invokeAllResult(msg);

                    inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);

                    storager.stopPlay(deviceId, channelId);

                });



                resultHolder.put(key, uuid, result);