From 7918f037342e95913fd6af62f32702930742456c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 十月 2022 16:38:28 +0800 Subject: [PATCH] 优化按需拉流配置,拉流代理支持按需拉流 --- src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java | 2 web_src/src/components/setting/Media.vue | 3 - src/main/resources/all-application.yml | 4 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 12 ---- web_src/src/components/dialog/MediaServerEdit.vue | 13 +--- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 93 ++++++++++++++++++------------ src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 4 - src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 8 -- sql/mysql.sql | 1 src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java | 5 + src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 10 +++ src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 2 sql/update.sql | 5 + web_src/src/components/dialog/StreamProxyEdit.vue | 11 +++ 14 files changed, 91 insertions(+), 82 deletions(-) diff --git a/sql/mysql.sql b/sql/mysql.sql index 8c6c7b0..a088c25 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -277,7 +277,6 @@ `rtspSSLPort` int NOT NULL, `autoConfig` int NOT NULL, `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `streamNoneReaderDelayMS` int NOT NULL, `rtpEnable` int NOT NULL, `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, diff --git a/sql/update.sql b/sql/update.sql index e69de29..e0d963b 100644 --- a/sql/update.sql +++ b/sql/update.sql @@ -0,0 +1,5 @@ +alter table wvp.media_server + drop column streamNoneReaderDelayMS; + +alter table stream_proxy + add enable_disable_none_reader bit(1) default null; diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 35ff08e..708f72b 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -69,9 +69,6 @@ @Value("${media.secret}") private String secret; - @Value("${media.stream-none-reader-delay-ms:15000}") - private int streamNoneReaderDelayMS = 15000; - @Value("${media.rtp.enable}") private boolean rtpEnable; @@ -151,10 +148,6 @@ return secret; } - public int getStreamNoneReaderDelayMS() { - return streamNoneReaderDelayMS; - } - public boolean isRtpEnable() { return rtpEnable; } @@ -219,7 +212,6 @@ mediaServerItem.setRtspSSLPort(rtspSSLPort); mediaServerItem.setAutoConfig(autoConfig); mediaServerItem.setSecret(secret); - mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS); mediaServerItem.setRtpEnable(rtpEnable); mediaServerItem.setRtpPortRange(rtpPortRange); mediaServerItem.setSendRtpPortRange(sendRtpPortRange); diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java index cad6e69..ea2655e 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java @@ -33,6 +33,8 @@ private Boolean usePushingAsStatus = Boolean.TRUE; + private Boolean streamOnDemand = Boolean.TRUE; + private String serverId = "000000"; private String thirdPartyGBIdReg = "[\\s\\S]*"; @@ -146,4 +148,12 @@ public void setUsePushingAsStatus(Boolean usePushingAsStatus) { this.usePushingAsStatus = usePushingAsStatus; } + + public Boolean getStreamOnDemand() { + return streamOnDemand; + } + + public void setStreamOnDemand(Boolean streamOnDemand) { + this.streamOnDemand = streamOnDemand; + } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java index e1689c9..bde4f82 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java @@ -558,9 +558,12 @@ String app = json.getString("app"); JSONObject ret = new JSONObject(); ret.put("code", 0); + // 褰曞儚涓嬭浇 + ret.put("close", userSetting.getStreamOnDemand()); if ("rtp".equals(app)){ - ret.put("close", true); + // 鍥芥爣娴侊紝 鐐规挱/褰曞儚鍥炴斁/褰曞儚涓嬭浇 StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId); + // 鐐规挱 if (streamInfoForPlayCatch != null) { // 鏀跺埌鏃犱汉瑙傜湅璇存槑娴佷篃娌℃湁鍦ㄥ線涓婄骇鎺ㄩ�� if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) { @@ -590,40 +593,39 @@ redisCatchStorage.stopPlay(streamInfoForPlayCatch); storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId()); - }else{ - StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null); - if (streamInfoForPlayBackCatch != null ) { - if (streamInfoForPlayBackCatch.isPause()) { - ret.put("close", false); - }else { - Device device = deviceService.queryDevice(streamInfoForPlayBackCatch.getDeviceID()); - if (device != null) { - try { - cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(), - streamInfoForPlayBackCatch.getStream(), null); - } catch (InvalidArgumentException | ParseException | SipException | - SsrcTransactionNotFoundException e) { - logger.error("[鏃犱汉瑙傜湅]鍥炴斁锛� 鍙戦�丅YE澶辫触 {}", e.getMessage()); - } - } - redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(), - streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null); - } - + return ret; + } + // 褰曞儚鍥炴斁 + StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null); + if (streamInfoForPlayBackCatch != null ) { + if (streamInfoForPlayBackCatch.isPause()) { + ret.put("close", false); }else { - StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null); - // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦 - if (streamInfoForDownload != null) { - ret.put("close", false); + Device device = deviceService.queryDevice(streamInfoForPlayBackCatch.getDeviceID()); + if (device != null) { + try { + cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(), + streamInfoForPlayBackCatch.getStream(), null); + } catch (InvalidArgumentException | ParseException | SipException | + SsrcTransactionNotFoundException e) { + logger.error("[鏃犱汉瑙傜湅]鍥炴斁锛� 鍙戦�丅YE澶辫触 {}", e.getMessage()); + } } + redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(), + streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null); } + return ret; } - MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); - if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) { + // 褰曞儚涓嬭浇 + StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null); + // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦 + if (streamInfoForDownload != null) { ret.put("close", false); + return ret; } - return ret; }else { + // 闈炲浗鏍囨祦 鎺ㄦ祦/鎷夋祦浠g悊 + // 鎷夋祦浠g悊 StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId); if (streamProxyItem != null ) { if (streamProxyItem.isEnable_remove_none_reader()) { @@ -635,12 +637,21 @@ }else if (streamProxyItem.isEnable_disable_none_reader()) { // 鏃犱汉瑙傜湅鍋滅敤 ret.put("close", true); + // 淇敼鏁版嵁 + streamProxyService.stop(app, streamId); }else { ret.put("close", false); } + return ret; } - return ret; + // 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊 +// StreamPushItem streamPushItem = streamPushService.getPush(app, streamId); +// if (streamPushItem != null) { +// // TODO 鍙戦�佸仠姝� +// +// } } + return ret; } /** @@ -655,19 +666,27 @@ } String mediaServerId = json.getString("mediaServerId"); MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); - if (userSetting.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) { + if (userSetting.isAutoApplyPlay() && mediaInfo != null) { String app = json.getString("app"); String streamId = json.getString("stream"); if ("rtp".equals(app)) { - String[] s = streamId.split("_"); - if (s.length == 2) { - String deviceId = s[0]; - String channelId = s[1]; - Device device = redisCatchStorage.getDevice(deviceId); - if (device != null) { - playService.play(mediaInfo,deviceId, channelId, null, null, null); + if (mediaInfo.isRtpEnable()) { + String[] s = streamId.split("_"); + if (s.length == 2) { + String deviceId = s[0]; + String channelId = s[1]; + Device device = redisCatchStorage.getDevice(deviceId); + if (device != null) { + playService.play(mediaInfo,deviceId, channelId, null, null, null); + } } } + }else { + // 鎷夋祦浠g悊 + StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(app, streamId); + if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) { + streamProxyService.start(app, streamId); + } } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java index ec09ce5..bf58187 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java @@ -54,9 +54,6 @@ @Schema(description = "ZLM閴存潈鍙傛暟") private String secret; - @Schema(description = "鏌愪釜娴佹棤浜鸿鐪嬫椂锛岃Е鍙慼ook.on_stream_none_reader浜嬩欢鐨勬渶澶х瓑寰呮椂闂达紝鍗曚綅姣") - private int streamNoneReaderDelayMS; - @Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�") private int hookAliveInterval; @@ -119,7 +116,6 @@ rtspSSLPort = zlmServerConfig.getRtspSSlport(); autoConfig = true; // 榛樿鍊紅rue; secret = zlmServerConfig.getApiSecret(); - streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS(); hookAliveInterval = zlmServerConfig.getHookAliveInterval(); rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛 rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙e彿 @@ -238,14 +234,6 @@ public void setSecret(String secret) { this.secret = secret; - } - - public int getStreamNoneReaderDelayMS() { - return streamNoneReaderDelayMS; - } - - public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) { - this.streamNoneReaderDelayMS = streamNoneReaderDelayMS; } public boolean isRtpEnable() { 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 f0d08a1..ea0bdca 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 @@ -38,7 +38,7 @@ @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃跺垹闄�") private boolean enable_remove_none_reader; - @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃朵笉鍚敤") + @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�") private boolean enable_disable_none_reader; @Schema(description = "涓婄骇骞冲彴鍥芥爣ID") private String platformGbId; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index afa2daa..7c5b149 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -541,7 +541,6 @@ param.put("hook.on_record_mp4",""); } param.put("hook.timeoutSec","20"); - param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS()==-1?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() ); // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆� // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�) // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿 @@ -606,7 +605,6 @@ mediaServerItem.setStreamIp(ip); mediaServerItem.setHookIp(sipConfig.getIp()); mediaServerItem.setSdpIp(ip); - mediaServerItem.setStreamNoneReaderDelayMS(zlmServerConfig.getGeneralStreamNoneReaderDelayMS()); return mediaServerItem; } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java index 0e37bbf..95b3d15 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java @@ -26,7 +26,6 @@ "rtspSSLPort, " + "autoConfig, " + "secret, " + - "streamNoneReaderDelayMS, " + "rtpEnable, " + "rtpPortRange, " + "sendRtpPortRange, " + @@ -51,7 +50,6 @@ "${rtspSSLPort}, " + "${autoConfig}, " + "'${secret}', " + - "${streamNoneReaderDelayMS}, " + "${rtpEnable}, " + "'${rtpPortRange}', " + "'${sendRtpPortRange}', " + @@ -77,7 +75,6 @@ "<if test=\"rtspPort != null\">, rtspPort=${rtspPort}</if>" + "<if test=\"rtspSSLPort != null\">, rtspSSLPort=${rtspSSLPort}</if>" + "<if test=\"autoConfig != null\">, autoConfig=${autoConfig}</if>" + - "<if test=\"streamNoneReaderDelayMS != null\">, streamNoneReaderDelayMS=${streamNoneReaderDelayMS}</if>" + "<if test=\"rtpEnable != null\">, rtpEnable=${rtpEnable}</if>" + "<if test=\"rtpPortRange != null\">, rtpPortRange='${rtpPortRange}'</if>" + "<if test=\"sendRtpPortRange != null\">, sendRtpPortRange='${sendRtpPortRange}'</if>" + @@ -102,7 +99,6 @@ "<if test=\"rtspPort != null\">, rtspPort=${rtspPort}</if>" + "<if test=\"rtspSSLPort != null\">, rtspSSLPort=${rtspSSLPort}</if>" + "<if test=\"autoConfig != null\">, autoConfig=${autoConfig}</if>" + - "<if test=\"streamNoneReaderDelayMS != null\">, streamNoneReaderDelayMS=${streamNoneReaderDelayMS}</if>" + "<if test=\"rtpEnable != null\">, rtpEnable=${rtpEnable}</if>" + "<if test=\"rtpPortRange != null\">, rtpPortRange='${rtpPortRange}'</if>" + "<if test=\"sendRtpPortRange != null\">, sendRtpPortRange='${sendRtpPortRange}'</if>" + diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java index c05910e..a9827ad 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java @@ -11,10 +11,10 @@ public interface StreamProxyMapper { @Insert("INSERT INTO stream_proxy (type, name, app, stream,mediaServerId, url, src_url, dst_url, " + - "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable, status, enable_remove_none_reader, createTime) VALUES" + + "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable, status, enable_remove_none_reader, enable_disable_none_reader, createTime) VALUES" + "('${type}','${name}', '${app}', '${stream}', '${mediaServerId}','${url}', '${src_url}', '${dst_url}', " + "'${timeout_ms}', '${ffmpeg_cmd_key}', '${rtp_type}', ${enable_hls}, ${enable_mp4}, ${enable}, ${status}, " + - "${enable_remove_none_reader}, '${createTime}' )") + "${enable_remove_none_reader}, ${enable_disable_none_reader}, '${createTime}' )") int add(StreamProxyItem streamProxyDto); @Update("UPDATE stream_proxy " + @@ -33,6 +33,7 @@ "enable=#{enable}, " + "status=#{status}, " + "enable_remove_none_reader=#{enable_remove_none_reader}, " + + "enable_disable_none_reader=#{enable_disable_none_reader}, " + "enable_mp4=#{enable_mp4} " + "WHERE app=#{app} AND stream=#{stream}") int update(StreamProxyItem streamProxyDto); diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index ed025b9..49d5aca 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -146,8 +146,6 @@ auto-config: true # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc - # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS - stream-none-reader-delay-ms: 18000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦 # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇� rtp: # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� @@ -190,6 +188,8 @@ logInDatebase: true # 浣跨敤鎺ㄦ祦鐘舵�佷綔涓烘帹娴侀�氶亾鐘舵�� use-pushing-as-status: true + # 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀� + stream-on-demand: true # 鍏抽棴鍦ㄧ嚎鏂囨。锛堢敓浜х幆澧冨缓璁叧闂級 springdoc: diff --git a/web_src/src/components/dialog/MediaServerEdit.vue b/web_src/src/components/dialog/MediaServerEdit.vue index 1754461..24f8c85 100644 --- a/web_src/src/components/dialog/MediaServerEdit.vue +++ b/web_src/src/components/dialog/MediaServerEdit.vue @@ -41,10 +41,6 @@ <el-input v-if="currentStep === 2" v-model="mediaServerForm.httpPort" disabled :disabled="mediaServerForm.defaultServer"></el-input> <el-input v-if="currentStep === 3" v-model="mediaServerForm.httpPort" :disabled="mediaServerForm.defaultServer"></el-input> </el-form-item> - <el-form-item label="SECRET" prop="secret"> - <el-input v-if="currentStep === 2" v-model="mediaServerForm.secret" disabled :disabled="mediaServerForm.defaultServer"></el-input> - <el-input v-if="currentStep === 3" v-model="mediaServerForm.secret" :disabled="mediaServerForm.defaultServer"></el-input> - </el-form-item> <el-form-item label="HOOK IP" prop="ip"> <el-input v-model="mediaServerForm.hookIp" placeholder="濯掍綋鏈嶅姟HOOK_IP" clearable :disabled="mediaServerForm.defaultServer"></el-input> </el-form-item> @@ -74,6 +70,10 @@ <el-form-item label="RTMPS PORT" prop="rtmpSSlPort"> <el-input v-model="mediaServerForm.rtmpSSlPort" placeholder="濯掍綋鏈嶅姟RTMPS_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input> </el-form-item> + <el-form-item label="SECRET" prop="secret"> + <el-input v-if="currentStep === 2" v-model="mediaServerForm.secret" disabled :disabled="mediaServerForm.defaultServer"></el-input> + <el-input v-if="currentStep === 3" v-model="mediaServerForm.secret" :disabled="mediaServerForm.defaultServer"></el-input> + </el-form-item> <el-form-item label="鑷姩閰嶇疆濯掍綋鏈嶅姟" > <el-switch v-model="mediaServerForm.autoConfig" :disabled="mediaServerForm.defaultServer"></el-switch> </el-form-item> @@ -93,9 +93,6 @@ <el-input v-model="sendRtpPortRange1" placeholder="璧峰" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange1" :disabled="mediaServerForm.defaultServer"></el-input> - <el-input v-model="sendRtpPortRange2" placeholder="缁堟" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange2" :disabled="mediaServerForm.defaultServer"></el-input> - </el-form-item> - <el-form-item label="鏃犱汉瑙傜湅澶氫箙鍚庡仠姝㈡媺娴�" > - <el-input v-model.number="mediaServerForm.streamNoneReaderDelayMS" clearable :disabled="mediaServerForm.defaultServer"></el-input> </el-form-item> <el-form-item label="褰曞儚绠$悊鏈嶅姟绔彛" prop="recordAssistPort"> <el-input v-model.number="mediaServerForm.recordAssistPort" :disabled="mediaServerForm.defaultServer"> @@ -172,7 +169,6 @@ hookIp: "", sdpIp: "", streamIp: "", - streamNoneReaderDelayMS: "", secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc", httpPort: "", httpSSlPort: "", @@ -332,7 +328,6 @@ hookIp: "", sdpIp: "", streamIp: "", - streamNoneReaderDelayMS: "", secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc", httpPort: "", httpSSlPort: "", diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue index 936bc53..1270999 100644 --- a/web_src/src/components/dialog/StreamProxyEdit.vue +++ b/web_src/src/components/dialog/StreamProxyEdit.vue @@ -105,7 +105,9 @@ <el-checkbox label="鍚敤" v-model="proxyParam.enable" ></el-checkbox> <el-checkbox label="杞琀LS" v-model="proxyParam.enable_hls" ></el-checkbox> <el-checkbox label="MP4褰曞埗" v-model="proxyParam.enable_mp4" ></el-checkbox> - <el-checkbox label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" v-model="proxyParam.enable_remove_none_reader" ></el-checkbox> + <el-checkbox label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" v-model="proxyParam.enable_remove_none_reader" @change="removeNoneReader"></el-checkbox> + <el-checkbox label="鏃犱汉瑙傜湅鍋滄鎷夋祦" v-model="proxyParam.enable_disable_none_reader" @change="disableNoneReaderHandType"></el-checkbox> + </div> </el-form-item> @@ -170,6 +172,7 @@ enable_hls: true, enable_mp4: false, enable_remove_none_reader: false, + enable_disable_none_reader: true, platformGbId: null, mediaServerId: null, }, @@ -276,6 +279,12 @@ if (this.platform.enable && this.platform.expires == "0") { this.platform.expires = "300"; } + }, + removeNoneReader: function(checked) { + this.proxyParam.enable_disable_none_reader = !checked; + }, + disableNoneReaderHandType: function(checked) { + this.proxyParam.enable_remove_none_reader = !checked; } }, }; diff --git a/web_src/src/components/setting/Media.vue b/web_src/src/components/setting/Media.vue index 19465b9..6642601 100644 --- a/web_src/src/components/setting/Media.vue +++ b/web_src/src/components/setting/Media.vue @@ -42,9 +42,6 @@ <el-form-item label="鎺ュ彛瀵嗛挜" prop="secret"> <el-input v-model="form.secret" clearable></el-input> </el-form-item> - <el-form-item label="鏃犱汉瑙傜湅瑙﹀彂鏃堕暱"> - <el-input v-model.number="form.streamNoneReaderDelayMS" clearable></el-input> - </el-form-item> <el-form-item label="鑷姩閰嶇疆"> <el-switch v-model="form.autoConfig"></el-switch> </el-form-item> -- Gitblit v1.8.0