修复推流时存入推流数据的问题

648540858

2024-06-20 050882d6a614f87d33d90bc5b344c774d9f6e71d

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

@@ -10,8 +10,8 @@
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

import com.genersoft.iot.vmp.gb28181.bean.*;

import com.genersoft.iot.vmp.gb28181.event.EventPublisher;

import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;

import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;

import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;

import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;

@@ -24,11 +24,12 @@
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.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;

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

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

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

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

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

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

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

@@ -47,7 +48,6 @@
import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import java.text.ParseException;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.UUID;

@@ -81,6 +81,10 @@
    @Autowired

    private IRedisCatchStorage redisCatchStorage;





    @Autowired

    private IRedisRpcService redisRpcService;



    @Autowired

    private IInviteStreamService inviteStreamService;



@@ -101,9 +105,6 @@


    @Autowired

    private EventPublisher eventPublisher;



    @Autowired

    private ZLMMediaListManager zlmMediaListManager;



    @Autowired

    private ZlmHttpHookSubscribe subscribe;

@@ -129,6 +130,9 @@


    @Autowired

    private RedisTemplate<Object, Object> redisTemplate;



    @Autowired

    private IStreamPushService streamPushService;



    /**

     * 服务器定时上报时间，上报间隔可配置，默认10s上报一次

@@ -175,7 +179,7 @@
            }

        });

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

            Map<String, String> paramMap = urlParamToMap(param.getParams());

            Map<String, String> paramMap = MediaServerUtils.urlParamToMap(param.getParams());

            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());

            if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {

                return new HookResult(401, "Unauthorized");

@@ -216,7 +220,7 @@
                    logger.info("推流鉴权失败： 缺少必要参数：sign=md5(user表的pushKey)");

                    return new HookResultForOnPublish(401, "Unauthorized");

                }

                Map<String, String> paramMap = urlParamToMap(param.getParams());

                Map<String, String> paramMap = MediaServerUtils.urlParamToMap(param.getParams());

                String sign = paramMap.get("sign");

                if (sign == null) {

                    logger.info("推流鉴权失败： 缺少必要参数：sign=md5(user表的pushKey)");

@@ -236,10 +240,7 @@
                // 鉴权通过

                redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);

            }

        } else {

            zlmMediaListManager.sendStreamEvent(param.getApp(), param.getStream(), param.getMediaServerId());

        }





        HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();

        result.setEnable_audio(true);

@@ -260,7 +261,6 @@
        if ("rtp".equals(param.getApp())) {



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



            // 单端口模式下修改流 ID

            if (!mediaInfo.isRtpEnable() && inviteInfo == null) {

                String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));

@@ -268,6 +268,8 @@
                if (inviteInfo != null) {

                    result.setStream_replace(inviteInfo.getStream());

                    logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream());

                    // 单端口模式下修改流ID为目标流ID，不然其他地方可能都无法对应

                    param.setStream(inviteInfo.getStream());

                }

            }



@@ -287,7 +289,7 @@
                String channelId = ssrcTransactionForAll.get(0).getChannelId();

                DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);

                if (deviceChannel != null) {

                    result.setEnable_audio(deviceChannel.isHasAudio());

                    result.setEnable_audio(deviceChannel.getHasAudio());

                }

                // 如果是录像下载就设置视频间隔十秒

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

@@ -349,6 +351,11 @@
                logger.info("[ZLM HOOK] 流变化未找到ZLM, {}", param.getMediaServerId());

                return;

            }

            if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())

                    && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())

                    && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())  ) {

                return;

            }

            if (subscribe != null) {

                subscribe.response(mediaInfo, param);

            }

@@ -368,8 +375,24 @@
                        streamAuthorityInfo.setOriginTypeStr(param.getOriginTypeStr());

                    }

                    redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);



                    if (!"broadcast".equals(param.getApp()) && !"talk".equals(param.getApp())) {

                        Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());

                        param.setParamMap(params);

                        StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,

                                param.getApp(), param.getStream(), tracks, params.get("callId"));

                        param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));



                        param.setSeverId(userSetting.getServerId());

                        streamPushService.updatePush(param);

                        // 冗余数据，自己系统中自用

                        redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);

                    }

                }

            }else {

                redisCatchStorage.removePushListItem(param.getApp(), param.getStream(), param.getMediaServerId());

            }

            // TODO 修改为第一个为准 后续不再处理

            if ("rtsp".equals(param.getSchema())) {

                logger.info("流变化：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());

                if (param.isRegist()) {

@@ -450,25 +473,14 @@
                    if (!"rtp".equals(param.getApp())) {

                        String type = OriginType.values()[param.getOriginType()].getType();

                        if (param.isRegist()) {

                            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(

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

                            String callId = null;

                            if (streamAuthorityInfo != null) {

                                callId = streamAuthorityInfo.getCallId();

                            }

                            Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());

                            param.setParamMap(params);

                            StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,

                                    param.getApp(), param.getStream(), tracks, callId);

                                    param.getApp(), param.getStream(), tracks, params.get("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()

                                    || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {

                                param.setSeverId(userSetting.getServerId());

                                zlmMediaListManager.addPush(param);



                                // 冗余数据，自己系统中自用

                                redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);

                            }

                            redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);



                        } else {

                            // 兼容流注销时类型从redis记录获取

                            OnStreamChangedHookParam onStreamChangedHookParam = redisCatchStorage.getStreamInfo(

@@ -482,10 +494,13 @@
                                }

                            }

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

                            if (gbStream != null) {

//                           eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                            // 查找是否关联了国标， 关联了不删除， 置为离线

                            if (gbStream == null) {

                                storager.removeMedia(param.getApp(), param.getStream());

                            }else {

//                                eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                                storager.mediaOffline(param.getApp(), param.getStream());

                            }

                            zlmMediaListManager.removeMedia(param.getApp(), param.getStream());

                        }

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

                        if (gbStream != null) {

@@ -512,40 +527,35 @@
                            if (sendRtpItem == null) {

                                continue;

                            }



                            if (sendRtpItem.getApp().equals(param.getApp())) {

                                logger.info(sendRtpItem.toString());

                                if (userSetting.getServerId().equals(sendRtpItem.getServerId())) {

                                    // 通知其他wvp停止发流

//                                    redisCatchStorage.sendRtp

                                }else {

                                    String platformId = sendRtpItem.getPlatformId();

                                    ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);

                                    Device device = deviceService.getDevice(platformId);



                                    try {

                                        if (platform != null) {

                                            commanderFroPlatform.streamByeCmd(platform, sendRtpItem);

                                            redisCatchStorage.deleteSendRTPServer(platformId, sendRtpItem.getChannelId(),

                                                    sendRtpItem.getCallId(), sendRtpItem.getStream());

                                        } else {

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

                                            if (sendRtpItem.getPlayType().equals(InviteStreamType.BROADCAST)

                                                    || sendRtpItem.getPlayType().equals(InviteStreamType.TALK)) {

                                                AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                if (audioBroadcastCatch != null) {

                                                    // 来自上级平台的停止对讲

                                                    logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                    audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                }

                                // 在hook收到这个消息，说明发流一定是本级完成的。

                                ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());

                                ParentPlatform platform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());

                                Device device = deviceService.getDevice(sendRtpItem.getPlatformId());

                                try {

                                    if (platform != null) {

                                        commanderFroPlatform.streamByeCmd(platform, sendRtpItem);

                                        redisCatchStorage.deleteSendRTPServer(sendRtpItem);

                                        redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);

                                    } else if (device != null) {

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

                                        if (sendRtpItem.getPlayType().equals(InviteStreamType.BROADCAST)

                                                || sendRtpItem.getPlayType().equals(InviteStreamType.TALK)) {

                                            AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                            if (audioBroadcastCatch != null) {

                                                // 来自上级平台的停止对讲

                                                logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                            }

                                        }

                                    } catch (SipException | InvalidArgumentException | ParseException |

                                             SsrcTransactionNotFoundException e) {

                                        logger.error("[命令发送失败] 发送BYE: {}", e.getMessage());

                                    }else {

                                        // 通知其他wvp停止发流

                                        redisRpcService.rtpSendStopped(sendRtpItem.getRedisKey());

                                    }

                                } catch (SipException | InvalidArgumentException | ParseException |

                                         SsrcTransactionNotFoundException e) {

                                    logger.error("[命令发送失败] 发送BYE: {}", e.getMessage());

                                }



                            }

                        }

                    }

@@ -564,6 +574,19 @@


        logger.info("[ZLM HOOK]流无人观看：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(),

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



        MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

        if (mediaInfo == null) {

            JSONObject ret = new JSONObject();

            ret.put("code", 0);

            return ret;

        }

        if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())

                && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())

                && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())  ) {

            param.setStream(param.getStream().substring(0, param.getStream().lastIndexOf(mediaInfo.getTranscodeSuffix()) -1 ));

        }



        JSONObject ret = new JSONObject();

        ret.put("code", 0);

        // 国标类型的流

@@ -590,14 +613,10 @@
                            } catch (SipException | InvalidArgumentException | ParseException e) {

                                logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

                            }

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

                                    sendRtpItem.getCallId(), sendRtpItem.getStream());

                            redisCatchStorage.deleteSendRTPServer(sendRtpItem);

                            ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());

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

                                MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,

                                        sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),

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

                                messageForPushChannel.setPlatFormIndex(parentPlatform.getId());

                                redisCatchStorage.sendPlatformStopPlayMsg(messageForPushChannel);

                                redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, parentPlatform);

                            }

                        }

                    }

@@ -825,17 +844,18 @@
        }

        taskExecutor.execute(() -> {

            List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());

            if (sendRtpItems.size() > 0) {

            if (!sendRtpItems.isEmpty()) {

                for (SendRtpItem sendRtpItem : sendRtpItems) {

                    ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());

                    ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());

                    try {

                        commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());

                    } catch (SipException | InvalidArgumentException | ParseException e) {

                        logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

                    if(parentPlatform != null) {

                        try {

                            commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());

                        } catch (SipException | InvalidArgumentException | ParseException e) {

                            logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

                        }

                    }

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

                            sendRtpItem.getCallId(), sendRtpItem.getStream());

                    ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());

                    redisCatchStorage.deleteSendRTPServer(sendRtpItem);

                }

            }

        });

@@ -884,23 +904,5 @@
        });



        return HookResult.SUCCESS();

    }



    private Map<String, String> urlParamToMap(String params) {

        HashMap<String, String> map = new HashMap<>();

        if (ObjectUtils.isEmpty(params)) {

            return map;

        }

        String[] paramsArray = params.split("&");

        if (paramsArray.length == 0) {

            return map;

        }

        for (String param : paramsArray) {

            String[] paramArray = param.split("=");

            if (paramArray.length == 2) {

                map.put(paramArray[0], paramArray[1]);

            }

        }

        return map;

    }

}