From c8b0e66e0eedaaa368bac3a49bcf1d34fb5e7393 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:25:42 +0800
Subject: [PATCH] 合并主线

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java |  121 +++++++++++++++++++++++++++++++---------
 1 files changed, 93 insertions(+), 28 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
index 4587fb0..ffca0d5 100755
--- 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
@@ -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;
         }
 
@@ -241,6 +266,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;
+        }
     }
 
     public static class OriginSock{

--
Gitblit v1.8.0