From 7732a1d180f04ea8e3cd569a73a9288bca5626e9 Mon Sep 17 00:00:00 2001
From: wendy512 <wendy512@yeah.net>
Date: 星期四, 18 七月 2024 13:40:47 +0800
Subject: [PATCH] 解决国标视频回放判断streamMode时空指针异常问题
---
src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
old mode 100644
new mode 100755
index f9bb94b..79bdf78
--- a/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
@@ -1,10 +1,10 @@
package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
-import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.bean.InviteTimeOutCallback;
import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.github.pagehelper.PageInfo;
@@ -73,14 +73,13 @@
* @param errorEvent 淇′护閿欒浜嬩欢
* @param timeoutCallback 瓒呮椂浜嬩欢
*/
- void broadcastInvite(ParentPlatform platform, String channelId, MediaServerItem mediaServerItem, ZlmHttpHookSubscribe.Event hookEvent,
+ void broadcastInvite(ParentPlatform platform, String channelId, MediaServer mediaServerItem, HookSubscribe.Event hookEvent,
SipSubscribe.Event errorEvent, InviteTimeOutCallback timeoutCallback) throws InvalidArgumentException, ParseException, SipException;
/**
* 璇煶鍠婅瘽鍥炲BYE
- * @param platform 骞冲彴
- * @param channelId 閫氶亾
- * @param stream 娴佷俊鎭�
*/
- void stopBroadcast(ParentPlatform platform, String channelId, String stream )throws InvalidArgumentException, ParseException, SsrcTransactionNotFoundException, SipException;
+ void stopBroadcast(ParentPlatform platform, DeviceChannel channel, String stream,boolean sendBye, MediaServer mediaServerItem);
+
+ void addSimulatedSubscribeInfo(ParentPlatform parentPlatform);
}
--
Gitblit v1.8.0