aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-26 03:27:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: aunix:6c82601fe278225a33601ca868761eecc2a59826
Branches Tags
aunix:master
aunix:feature/transcode2
aunix:copilot/reliable-udp-projects
aunix:8.0
aunix:feature/async_write_file
aunix:feature/dynamic_library
aunix:7.0
aunix:feature/log_context
aunix:feature/transcode
aunix:feature/hls_record_disk
aunix:6.0
aunix:5.0
aunix:4.0
aunix:3.0
aunix:2.0
aunix:1.0
..
compare: aunix:0ead9b694597f9bc4075588fb30912c590052e2b
Branches Tags
aunix:master
aunix:feature/transcode2
aunix:copilot/reliable-udp-projects
aunix:8.0
aunix:feature/async_write_file
aunix:feature/dynamic_library
aunix:7.0
aunix:feature/log_context
aunix:feature/transcode
aunix:feature/hls_record_disk
aunix:6.0
aunix:5.0
aunix:4.0
aunix:3.0
aunix:2.0
aunix:1.0

No commits in common. "6c82601fe278225a33601ca868761eecc2a59826" and "0ead9b694597f9bc4075588fb30912c590052e2b" have entirely different histories.
6c82601fe2 ... 0ead9b6945

2 changed files with 10 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
server/WebApi.cpp
View File

@ -225,7 +225,6 @@ 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) {
if (!parser.content().empty()) {
try { try {
stringstream ss(parser.content()); stringstream ss(parser.content());
Value jsonArgs; Value jsonArgs;
@ -237,7 +236,6 @@ ApiArgsType getAllArgs(const Parser &parser) {
} catch (std::exception &ex) { } catch (std::exception &ex) {
WarnL << ex.what(); 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"];
} }

2
webrtc/WebRtcPusher.cpp
View File

@ -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() && _push_src) { if (canRecvRtp()) {
_push_src->setSdp(_answer_sdp->toRtspSdp()); _push_src->setSdp(_answer_sdp->toRtspSdp());
} }
} }