From d239ada9ac0d59313a39705c14eb617ab38569a7 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 12 Mar 2022 15:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebApi.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/server/WebApi.cpp b/server/WebApi.cpp index 60b64461..53c75d45 100755 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -487,12 +487,11 @@ void addStreamProxy(const string &vhost, const string &app, const string &stream }; template -static Type getArgsValue(const HttpAllArgs &allArgs, const string &key, Type default_value) { +static void getArgsValue(const HttpAllArgs &allArgs, const string &key, Type &value) { auto val = allArgs["key"]; - if (val.empty()) { - return default_value; + if (!val.empty()) { + value = (Type)val; } - return (Type)val; } /** @@ -917,17 +916,17 @@ void installWebApi() { CHECK_ARGS("vhost","app","stream","url"); ProtocolOption option; - option.enable_hls = getArgsValue(allArgs, "enable_hls", option.enable_hls); - option.enable_mp4 = getArgsValue(allArgs, "enable_mp4", option.enable_mp4); - option.enable_rtsp = getArgsValue(allArgs, "enable_rtsp", option.enable_rtsp); - option.enable_rtmp = getArgsValue(allArgs, "enable_rtmp", option.enable_rtmp); - option.enable_ts = getArgsValue(allArgs, "enable_ts", option.enable_ts); - option.enable_fmp4 = getArgsValue(allArgs, "enable_fmp4", option.enable_fmp4); - option.enable_audio = getArgsValue(allArgs, "enable_audio", option.enable_audio); - option.add_mute_audio = getArgsValue(allArgs, "add_mute_audio", option.add_mute_audio); - option.mp4_save_path = getArgsValue(allArgs, "mp4_save_path", option.mp4_save_path); - option.mp4_max_second = getArgsValue(allArgs, "mp4_max_second", option.mp4_max_second); - option.hls_save_path = getArgsValue(allArgs, "hls_save_path", option.hls_save_path); + getArgsValue(allArgs, "enable_hls", option.enable_hls); + getArgsValue(allArgs, "enable_mp4", option.enable_mp4); + getArgsValue(allArgs, "enable_rtsp", option.enable_rtsp); + getArgsValue(allArgs, "enable_rtmp", option.enable_rtmp); + getArgsValue(allArgs, "enable_ts", option.enable_ts); + getArgsValue(allArgs, "enable_fmp4", option.enable_fmp4); + getArgsValue(allArgs, "enable_audio", option.enable_audio); + getArgsValue(allArgs, "add_mute_audio", option.add_mute_audio); + getArgsValue(allArgs, "mp4_save_path", option.mp4_save_path); + getArgsValue(allArgs, "mp4_max_second", option.mp4_max_second); + getArgsValue(allArgs, "hls_save_path", option.hls_save_path); addStreamProxy(allArgs["vhost"], allArgs["app"],