From 9cdbe4c4efd592410dde0565c4b14c205b75c624 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Tue, 7 Jan 2020 15:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=8F=E8=AE=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebHook.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/WebHook.cpp b/server/WebHook.cpp index 6e0605bf..4eb54eec 100644 --- a/server/WebHook.cpp +++ b/server/WebHook.cpp @@ -227,20 +227,24 @@ void installWebHook(){ do_http_hook(hook_publish,body,[invoker](const Value &obj,const string &err){ if(err.empty()){ //推流鉴权成功 + bool enableRtxp = toRtxp; + bool enableHls = toHls; + bool enableMP4 = toMP4; + //兼容用户不传递enableRtxp、enableHls、enableMP4参数 if(obj.isMember("enableRtxp")){ - toRtxp = obj["enableRtxp"].asBool(); + enableRtxp = obj["enableRtxp"].asBool(); } if(obj.isMember("enableHls")){ - toHls = obj["enableHls"].asBool(); + enableHls = obj["enableHls"].asBool(); } if(obj.isMember("enableMP4")){ - toMP4 = obj["enableMP4"].asBool(); + enableMP4 = obj["enableMP4"].asBool(); } - invoker(err,toRtxp,toHls,toMP4); + invoker(err,enableRtxp,enableHls,enableMP4); }else{ //推流鉴权失败 invoker(err,false, false, false);