mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-06 10:57:50 +08:00
Compare commits
2 Commits
0ead9b6945
...
6c82601fe2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c82601fe2 | ||
|
|
725fdf1786 |
@ -225,16 +225,18 @@ ApiArgsType getAllArgs(const Parser &parser) {
|
||||
allArgs[pr.first] = strCoding::UrlDecodeComponent(pr.second);
|
||||
}
|
||||
} else if (parser["Content-Type"].find("application/json") == 0) {
|
||||
try {
|
||||
stringstream ss(parser.content());
|
||||
Value jsonArgs;
|
||||
ss >> jsonArgs;
|
||||
auto keys = jsonArgs.getMemberNames();
|
||||
for (auto key = keys.begin(); key != keys.end(); ++key) {
|
||||
allArgs[*key] = jsonArgs[*key].asString();
|
||||
if (!parser.content().empty()) {
|
||||
try {
|
||||
stringstream ss(parser.content());
|
||||
Value jsonArgs;
|
||||
ss >> jsonArgs;
|
||||
auto keys = jsonArgs.getMemberNames();
|
||||
for (auto key = keys.begin(); key != keys.end(); ++key) {
|
||||
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"];
|
||||
|
||||
@ -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()) {
|
||||
if (canRecvRtp() && _push_src) {
|
||||
_push_src->setSdp(_answer_sdp->toRtspSdp());
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user