mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-24 18:47: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);
|
allArgs[pr.first] = strCoding::UrlDecodeComponent(pr.second);
|
||||||
}
|
}
|
||||||
} else if (parser["Content-Type"].find("application/json") == 0) {
|
} else if (parser["Content-Type"].find("application/json") == 0) {
|
||||||
try {
|
if (!parser.content().empty()) {
|
||||||
stringstream ss(parser.content());
|
try {
|
||||||
Value jsonArgs;
|
stringstream ss(parser.content());
|
||||||
ss >> jsonArgs;
|
Value jsonArgs;
|
||||||
auto keys = jsonArgs.getMemberNames();
|
ss >> jsonArgs;
|
||||||
for (auto key = keys.begin(); key != keys.end(); ++key) {
|
auto keys = jsonArgs.getMemberNames();
|
||||||
allArgs[*key] = jsonArgs[*key].asString();
|
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()) {
|
} else if (!parser["Content-Type"].empty()) {
|
||||||
WarnL << "invalid Content-Type:" << parser["Content-Type"];
|
WarnL << "invalid Content-Type:" << parser["Content-Type"];
|
||||||
|
|||||||
@ -114,7 +114,7 @@ void WebRtcPusher::onRecvRtp(MediaTrack &track, const string &rid, RtpPacket::Pt
|
|||||||
void WebRtcPusher::onStartWebRTC() {
|
void WebRtcPusher::onStartWebRTC() {
|
||||||
WebRtcTransportImp::onStartWebRTC();
|
WebRtcTransportImp::onStartWebRTC();
|
||||||
_simulcast = _answer_sdp->supportSimulcast();
|
_simulcast = _answer_sdp->supportSimulcast();
|
||||||
if (canRecvRtp()) {
|
if (canRecvRtp() && _push_src) {
|
||||||
_push_src->setSdp(_answer_sdp->toRtspSdp());
|
_push_src->setSdp(_answer_sdp->toRtspSdp());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user