From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java | 139 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
old mode 100644
new mode 100755
index 29f91c8..ffca0d5
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.media.zlm.dto.hook;
-import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import java.util.List;
@@ -120,17 +120,17 @@
/**
* H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4
*/
- private int codecId;
+ private int codec_id;
/**
* 缂栫爜绫诲瀷鍚嶇О CodecAAC CodecH264
*/
- private String codecIdName;
+ private String codec_id_name;
/**
* Video = 0, Audio = 1
*/
- private int codecType;
+ private int codec_type;
/**
* 杞ㄩ亾鏄惁鍑嗗灏辩华
@@ -140,17 +140,17 @@
/**
* 闊抽閲囨牱浣嶆暟
*/
- private int sampleBit;
+ private int sample_bit;
/**
* 闊抽閲囨牱鐜�
*/
- private int sampleRate;
+ private int sample_rate;
/**
* 瑙嗛fps
*/
- private int fps;
+ private float fps;
/**
* 瑙嗛楂�
@@ -162,6 +162,31 @@
*/
private int width;
+ /**
+ * 甯ф暟
+ */
+ private int frames;
+
+ /**
+ * 鍏抽敭甯ф暟
+ */
+ private int key_frames;
+
+ /**
+ * GOP澶у皬
+ */
+ private int gop_size;
+
+ /**
+ * GOP闂撮殧鏃堕暱(ms)
+ */
+ private int gop_interval_ms;
+
+ /**
+ * 涓㈠抚鐜�
+ */
+ private float loss;
+
public int getChannels() {
return channels;
}
@@ -170,28 +195,28 @@
this.channels = channels;
}
- public int getCodecId() {
- return codecId;
+ public int getCodec_id() {
+ return codec_id;
}
- public void setCodecId(int codecId) {
- this.codecId = codecId;
+ public void setCodec_id(int codec_id) {
+ this.codec_id = codec_id;
}
- public String getCodecIdName() {
- return codecIdName;
+ public String getCodec_id_name() {
+ return codec_id_name;
}
- public void setCodecIdName(String codecIdName) {
- this.codecIdName = codecIdName;
+ public void setCodec_id_name(String codec_id_name) {
+ this.codec_id_name = codec_id_name;
}
- public int getCodecType() {
- return codecType;
+ public int getCodec_type() {
+ return codec_type;
}
- public void setCodecType(int codecType) {
- this.codecType = codecType;
+ public void setCodec_type(int codec_type) {
+ this.codec_type = codec_type;
}
public boolean isReady() {
@@ -202,27 +227,27 @@
this.ready = ready;
}
- public int getSampleBit() {
- return sampleBit;
+ public int getSample_bit() {
+ return sample_bit;
}
- public void setSampleBit(int sampleBit) {
- this.sampleBit = sampleBit;
+ public void setSample_bit(int sample_bit) {
+ this.sample_bit = sample_bit;
}
- public int getSampleRate() {
- return sampleRate;
+ public int getSample_rate() {
+ return sample_rate;
}
- public void setSampleRate(int sampleRate) {
- this.sampleRate = sampleRate;
+ public void setSample_rate(int sample_rate) {
+ this.sample_rate = sample_rate;
}
- public int getFps() {
+ public float getFps() {
return fps;
}
- public void setFps(int fps) {
+ public void setFps(float fps) {
this.fps = fps;
}
@@ -240,6 +265,46 @@
public void setWidth(int width) {
this.width = width;
+ }
+
+ public int getFrames() {
+ return frames;
+ }
+
+ public void setFrames(int frames) {
+ this.frames = frames;
+ }
+
+ public int getKey_frames() {
+ return key_frames;
+ }
+
+ public void setKey_frames(int key_frames) {
+ this.key_frames = key_frames;
+ }
+
+ public int getGop_size() {
+ return gop_size;
+ }
+
+ public void setGop_size(int gop_size) {
+ this.gop_size = gop_size;
+ }
+
+ public int getGop_interval_ms() {
+ return gop_interval_ms;
+ }
+
+ public void setGop_interval_ms(int gop_interval_ms) {
+ this.gop_interval_ms = gop_interval_ms;
+ }
+
+ public float getLoss() {
+ return loss;
+ }
+
+ public void setLoss(float loss) {
+ this.loss = loss;
}
}
@@ -291,7 +356,7 @@
}
}
- private StreamInfo streamInfo;
+ private StreamContent streamInfo;
public String getApp() {
return app;
@@ -407,11 +472,11 @@
this.docker = docker;
}
- public StreamInfo getStreamInfo() {
+ public StreamContent getStreamInfo() {
return streamInfo;
}
- public void setStreamInfo(StreamInfo streamInfo) {
+ public void setStreamInfo(StreamContent streamInfo) {
this.streamInfo = streamInfo;
}
@@ -430,4 +495,14 @@
public void setCallId(String callId) {
this.callId = callId;
}
+
+ @Override
+ public String toString() {
+ return "OnStreamChangedHookParam{" +
+ "regist=" + regist +
+ ", app='" + app + '\'' +
+ ", stream='" + stream + '\'' +
+ ", severId='" + severId + '\'' +
+ '}';
+ }
}
--
Gitblit v1.8.0