From 2ef411129756224061b9d44f3fd998a73db8b0a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 05 六月 2023 10:28:11 +0800
Subject: [PATCH] 修复拉流代理的ffmpeg代理方式

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java |   74 ++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
index 8637e3f..dd517e3 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -16,32 +16,30 @@
     @Schema(description = "娴両D")
     private String stream;
     @Schema(description = "娴佸獟浣撴湇鍔D")
-    private String media_server_id;
+    private String mediaServerId;
     @Schema(description = "鎷夋祦鍦板潃")
     private String url;
     @Schema(description = "鎷夋祦鍦板潃")
-    private String src_url;
+    private String srcUrl;
     @Schema(description = "鐩爣鍦板潃")
-    private String dst_url;
+    private String dstUrl;
     @Schema(description = "瓒呮椂鏃堕棿")
-    private int timeout_ms;
+    private int timeoutMs;
     @Schema(description = "ffmpeg妯℃澘KEY")
-    private String ffmpeg_cmd_key;
+    private String ffmpegCmdKey;
     @Schema(description = "rtsp鎷夋祦鏃讹紝鎷夋祦鏂瑰紡锛�0锛歵cp锛�1锛歶dp锛�2锛氱粍鎾�")
-    private String rtp_type;
+    private String rtpType;
     @Schema(description = "鏄惁鍚敤")
     private boolean enable;
     @Schema(description = "鏄惁鍚敤闊抽")
-    private boolean enable_audio;
+    private boolean enableAudio;
     @Schema(description = "鏄惁鍚敤MP4")
-    private boolean enable_mp4;
+    private boolean enableMp4;
     @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃跺垹闄�")
-    private boolean enable_remove_none_reader;
+    private boolean enableRemoveNoneReader;
 
     @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�")
-    private boolean enable_disable_none_reader;
-    @Schema(description = "鍒涘缓鏃堕棿")
-    private String create_time;
+    private boolean enableDisableNoneReader;
 
     public String getType() {
         return type;
@@ -73,12 +71,12 @@
 
     @Override
     public String getMediaServerId() {
-        return media_server_id;
+        return mediaServerId;
     }
 
     @Override
     public void setMediaServerId(String mediaServerId) {
-        this.media_server_id = mediaServerId;
+        this.mediaServerId = mediaServerId;
     }
 
     public String getUrl() {
@@ -90,43 +88,43 @@
     }
 
     public String getSrcUrl() {
-        return src_url;
+        return srcUrl;
     }
 
     public void setSrcUrl(String src_url) {
-        this.src_url = src_url;
+        this.srcUrl = src_url;
     }
 
     public String getDstUrl() {
-        return dst_url;
+        return dstUrl;
     }
 
     public void setDstUrl(String dst_url) {
-        this.dst_url = dst_url;
+        this.dstUrl = dst_url;
     }
 
     public int getTimeoutMs() {
-        return timeout_ms;
+        return timeoutMs;
     }
 
     public void setTimeoutMs(int timeout_ms) {
-        this.timeout_ms = timeout_ms;
+        this.timeoutMs = timeout_ms;
     }
 
     public String getFfmpegCmdKey() {
-        return ffmpeg_cmd_key;
+        return ffmpegCmdKey;
     }
 
     public void setFfmpegCmdKey(String ffmpeg_cmd_key) {
-        this.ffmpeg_cmd_key = ffmpeg_cmd_key;
+        this.ffmpegCmdKey = ffmpeg_cmd_key;
     }
 
     public String getRtpType() {
-        return rtp_type;
+        return rtpType;
     }
 
     public void setRtpType(String rtp_type) {
-        this.rtp_type = rtp_type;
+        this.rtpType = rtp_type;
     }
 
     public boolean isEnable() {
@@ -138,44 +136,36 @@
     }
 
     public boolean isEnableMp4() {
-        return enable_mp4;
+        return enableMp4;
     }
 
     public void setEnableMp4(boolean enable_mp4) {
-        this.enable_mp4 = enable_mp4;
-    }
-
-    @Override
-    public String getCreateTime() {
-        return create_time;
-    }
-
-    @Override
-    public void setCreateTime(String create_time) {
-        this.create_time = create_time;
+        this.enableMp4 = enable_mp4;
     }
 
     public boolean isEnableRemoveNoneReader() {
-        return enable_remove_none_reader;
+        return enableRemoveNoneReader;
     }
 
     public void setEnableRemoveNoneReader(boolean enable_remove_none_reader) {
-        this.enable_remove_none_reader = enable_remove_none_reader;
+        this.enableRemoveNoneReader = enable_remove_none_reader;
     }
 
     public boolean isEnableDisableNoneReader() {
-        return enable_disable_none_reader;
+        return enableDisableNoneReader;
     }
 
     public void setEnableDisableNoneReader(boolean enable_disable_none_reader) {
-        this.enable_disable_none_reader = enable_disable_none_reader;
+        this.enableDisableNoneReader = enable_disable_none_reader;
     }
 
     public boolean isEnableAudio() {
-        return enable_audio;
+        return enableAudio;
     }
 
     public void setEnableAudio(boolean enable_audio) {
-        this.enable_audio = enable_audio;
+        this.enableAudio = enable_audio;
     }
+
+
 }

--
Gitblit v1.8.0