mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-22 19:00:01 +08:00
BugFix: fix webrtc bad weak ptr exception
This commit is contained in:
parent
64f15202de
commit
9ff4c09211
@ -1737,8 +1737,8 @@ void installWebApi() {
|
|||||||
auto offer = allArgs.getArgs();
|
auto offer = allArgs.getArgs();
|
||||||
CHECK(!offer.empty(), "http body(webrtc offer sdp) is empty");
|
CHECK(!offer.empty(), "http body(webrtc offer sdp) is empty");
|
||||||
|
|
||||||
WebRtcPluginManager::Instance().getAnswerSdp(static_cast<Session&>(sender), type,
|
auto args = std::make_shared<WebRtcArgsImp>(allArgs, sender.getIdentifier());
|
||||||
WebRtcArgsImp(allArgs, sender.getIdentifier()),
|
WebRtcPluginManager::Instance().getAnswerSdp(static_cast<Session&>(sender), type, *args,
|
||||||
[invoker, val, offer, headerOut](const WebRtcInterface &exchanger) mutable {
|
[invoker, val, offer, headerOut](const WebRtcInterface &exchanger) mutable {
|
||||||
//设置返回类型
|
//设置返回类型
|
||||||
headerOut["Content-Type"] = HttpFileManager::getContentType(".json");
|
headerOut["Content-Type"] = HttpFileManager::getContentType(".json");
|
||||||
@ -1765,7 +1765,8 @@ void installWebApi() {
|
|||||||
|
|
||||||
auto &session = static_cast<Session&>(sender);
|
auto &session = static_cast<Session&>(sender);
|
||||||
auto location = std::string("http") + (session.overSsl() ? "s" : "") + "://" + allArgs["host"] + delete_webrtc_url;
|
auto location = std::string("http") + (session.overSsl() ? "s" : "") + "://" + allArgs["host"] + delete_webrtc_url;
|
||||||
WebRtcPluginManager::Instance().getAnswerSdp(session, type, WebRtcArgsImp(allArgs, sender.getIdentifier()),
|
auto args = std::make_shared<WebRtcArgsImp>(allArgs, sender.getIdentifier());
|
||||||
|
WebRtcPluginManager::Instance().getAnswerSdp(session, type, *args,
|
||||||
[invoker, offer, headerOut, location](const WebRtcInterface &exchanger) mutable {
|
[invoker, offer, headerOut, location](const WebRtcInterface &exchanger) mutable {
|
||||||
// 设置跨域
|
// 设置跨域
|
||||||
headerOut["Access-Control-Allow-Origin"] = "*";
|
headerOut["Access-Control-Allow-Origin"] = "*";
|
||||||
|
Loading…
Reference in New Issue
Block a user