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

648540858

2024-06-20 050882d6a614f87d33d90bc5b344c774d9f6e71d

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

@@ -375,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()) {

@@ -457,24 +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());

                                streamPushService.updatePush(param);

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

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

                            }



                        } else {

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

                            OnStreamChangedHookParam onStreamChangedHookParam = redisCatchStorage.getStreamInfo(