Merge branch 'refs/heads/2.7.0' into 271-优化notify存储

648540858

2024-05-13 588b1da35a1a51ddfca76fb8ca9c2c0c6cd70038

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

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

@@ -516,15 +516,15 @@
                            if (sendRtpItem == null) {

                                continue;

                            }



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

                                // 在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.getPlatformId(), sendRtpItem.getChannelId(),

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

                                        redisCatchStorage.deleteSendRTPServer(sendRtpItem);

                                        redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);

                                    } else if (device != null) {

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

@@ -539,7 +539,7 @@
                                        }

                                    }else {

                                        // 通知其他wvp停止发流

                                        redisRpcService.rtpSendStopped(sendRtpItem);

                                        redisRpcService.rtpSendStopped(sendRtpItem.getRedisKey());

                                    }

                                } catch (SipException | InvalidArgumentException | ParseException |

                                         SsrcTransactionNotFoundException e) {

@@ -589,8 +589,8 @@
                            } 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()) {

                                redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, parentPlatform);

                            }

@@ -820,17 +820,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);

                }

            }

        });