From 72b437cc52e2907c9a66d6bda60acbffc736cdb8 Mon Sep 17 00:00:00 2001
From: BradyXu <brady_xu@outlook.com>
Date: 星期日, 12 五月 2024 02:15:41 +0800
Subject: [PATCH] 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
index d9e89fa..2b5e16b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.AudioBroadcastEvent;
import gov.nist.javax.sip.message.SIPResponse;
@@ -15,7 +15,7 @@
public AudioBroadcastCatch(
String deviceId,
String channelId,
- MediaServerItem mediaServerItem,
+ MediaServer mediaServerItem,
String app,
String stream,
AudioBroadcastEvent event,
@@ -48,7 +48,7 @@
/**
* 娴佸獟浣撲俊鎭�
*/
- private MediaServerItem mediaServerItem;
+ private MediaServer mediaServerItem;
/**
* 鍏宠仈鐨勬祦APP
@@ -109,20 +109,12 @@
return sipTransactionInfo;
}
- public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
- this.sipTransactionInfo = sipTransactionInfo;
+ public MediaServer getMediaServerItem() {
+ return mediaServerItem;
}
- public void setSipTransactionInfoByRequset(SIPResponse response) {
- this.sipTransactionInfo = new SipTransactionInfo(response, false);
- }
-
- public AudioBroadcastEvent getEvent() {
- return event;
- }
-
- public void setEvent(AudioBroadcastEvent event) {
- this.event = event;
+ public void setMediaServerItem(MediaServer mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
}
public String getApp() {
@@ -149,11 +141,19 @@
isFromPlatform = fromPlatform;
}
- public MediaServerItem getMediaServerItem() {
- return mediaServerItem;
+ public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
+ this.sipTransactionInfo = sipTransactionInfo;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
+ public AudioBroadcastEvent getEvent() {
+ return event;
+ }
+
+ public void setEvent(AudioBroadcastEvent event) {
+ this.event = event;
+ }
+
+ public void setSipTransactionInfoByRequset(SIPResponse sipResponse) {
+ this.sipTransactionInfo = new SipTransactionInfo(sipResponse);
}
}
--
Gitblit v1.8.0