server/WebApi.cpp

@@ -225,18 +225,16 @@ ApiArgsType getAllArgs(const Parser &parser) {
             allArgs[pr.first] = strCoding::UrlDecodeComponent(pr.second);
         }
     } else if (parser["Content-Type"].find("application/json") == 0) {
-        if (!parser.content().empty()) {
+        try {
-            try {
+            stringstream ss(parser.content());
-                stringstream ss(parser.content());
+            Value jsonArgs;
-                Value jsonArgs;
+            ss >> jsonArgs;
-                ss >> jsonArgs;
+            auto keys = jsonArgs.getMemberNames();
-                auto keys = jsonArgs.getMemberNames();
+            for (auto key = keys.begin(); key != keys.end(); ++key) {
-                for (auto key = keys.begin(); key != keys.end(); ++key) {
+                allArgs[*key] = jsonArgs[*key].asString();
-                    allArgs[*key] = jsonArgs[*key].asString();
-                }
-            } catch (std::exception &ex) {
-                WarnL << ex.what();
             }
+        } catch (std::exception &ex) {
+            WarnL << ex.what();
         }
     } else if (!parser["Content-Type"].empty()) {
         WarnL << "invalid Content-Type:" << parser["Content-Type"];

webrtc/WebRtcPusher.cpp

@@ -114,7 +114,7 @@ void WebRtcPusher::onRecvRtp(MediaTrack &track, const string &rid, RtpPacket::Pt
 void WebRtcPusher::onStartWebRTC() {
     WebRtcTransportImp::onStartWebRTC();
     _simulcast = _answer_sdp->supportSimulcast();
-    if (canRecvRtp() && _push_src) {
+    if (canRecvRtp()) {
         _push_src->setSdp(_answer_sdp->toRtspSdp());
     }
 }