From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 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 e2adddc..4c3d7bd 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,11 +1,8 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import gov.nist.javax.sip.message.SIPRequest;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import gov.nist.javax.sip.message.SIPResponse;
-import gov.nist.javax.sip.stack.SIPDialog;
-
-import javax.sip.Dialog;
/**
* 缂撳瓨璇煶骞挎挱鐨勭姸鎬�
@@ -14,10 +11,18 @@
public class AudioBroadcastCatch {
- public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status) {
+ public AudioBroadcastCatch(String deviceId,
+ String channelId,
+ AudioBroadcastCatchStatus status,
+ MediaServerItem mediaServerItem,
+ String app,
+ String stream) {
this.deviceId = deviceId;
this.channelId = channelId;
this.status = status;
+ this.mediaServerItem = mediaServerItem;
+ this.app = app;
+ this.stream = stream;
}
public AudioBroadcastCatch() {
@@ -34,6 +39,21 @@
private String channelId;
/**
+ * 浣跨敤鐨勬祦濯掍綋
+ */
+ private MediaServerItem mediaServerItem;
+
+ /**
+ * 寰呮帹閫佺粰璁惧鐨勬祦搴旂敤鍚�
+ */
+ private String app;
+
+ /**
+ * 寰呮帹閫佺粰璁惧鐨勬祦ID
+ */
+ private String stream;
+
+ /**
* 璇煶骞挎挱鐘舵��
*/
private AudioBroadcastCatchStatus status;
@@ -42,6 +62,8 @@
* 璇锋眰淇℃伅
*/
private SipTransactionInfo sipTransactionInfo;
+
+ private MediaServerItem mediaServerItem;
public String getDeviceId() {
@@ -72,11 +94,43 @@
return sipTransactionInfo;
}
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
+ }
+
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
+ }
+
+ public String getApp() {
+ return app;
+ }
+
+ public void setApp(String app) {
+ this.app = app;
+ }
+
+ public String getStream() {
+ return stream;
+ }
+
+ public void setStream(String stream) {
+ this.stream = stream;
+ }
+
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
public void setSipTransactionInfoByRequset(SIPResponse response) {
- this.sipTransactionInfo = new SipTransactionInfo(response);
+ this.sipTransactionInfo = new SipTransactionInfo(response, false);
+ }
+
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
+ }
+
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
}
}
--
Gitblit v1.8.0