mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-21 08:13:49 +08:00
feat: 增加webrtc代理拉流 (#4389)
- 增加客户端模式,支持主动拉流、推流: - addStreamProxy接口新增支持whep主动拉流,拉流地址目前只兼容zlm的whep url。 - addStreamPusherProxy接口新增支持whip主动推流,推流地址目前只兼容zlm的whip url。 - 以上推流url格式为webrtc[s]://server_host:server_port/app/stream_id?key=value, 内部会自动转换为http[s]://server_host:server_port/index/api/[whip/whep]?app=app&stream=stream_id&key=value。 - 增加WebRtc p2p 模式: - 增加 ICE FULL模式。 - 增加STUN/TURN 服务器。 - 增加websocket 信令。 - 增加P2P代理拉流。 --------- Co-authored-by: xia-chu <771730766@qq.com> Co-authored-by: mtdxc <mtdxc@126.com> Co-authored-by: cqm <cqm@97kid.com>
This commit is contained in:
@@ -26,6 +26,7 @@ public:
|
||||
void play(const std::string &url) override;
|
||||
toolkit::EventPoller::Ptr getPoller();
|
||||
void setOnCreateSocket(toolkit::Socket::onCreateSocket cb);
|
||||
const PlayerBase::Ptr& getDelegate() const { return _delegate; }
|
||||
|
||||
private:
|
||||
toolkit::EventPoller::Ptr _poller;
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
#ifdef ENABLE_SRT
|
||||
#include "Srt/SrtPlayerImp.h"
|
||||
#endif // ENABLE_SRT
|
||||
|
||||
#ifdef ENABLE_WEBRTC
|
||||
#include "../webrtc/WebRtcProxyPlayerImp.h"
|
||||
#endif // ENABLE_WEBRTC
|
||||
using namespace std;
|
||||
using namespace toolkit;
|
||||
|
||||
@@ -84,6 +86,11 @@ PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &in_poller, cons
|
||||
return PlayerBase::Ptr(new SrtPlayerImp(poller), release_func);
|
||||
}
|
||||
#endif//ENABLE_SRT
|
||||
#ifdef ENABLE_WEBRTC
|
||||
if ((strcasecmp("webrtc", prefix.data()) == 0 || strcasecmp("webrtcs", prefix.data()) == 0)) {
|
||||
return PlayerBase::Ptr(new WebRtcProxyPlayerImp(poller), release_func);
|
||||
}
|
||||
#endif//ENABLE_WEBRTC
|
||||
|
||||
throw std::invalid_argument("not supported play schema:" + url_in);
|
||||
}
|
||||
|
||||
@@ -286,6 +286,10 @@ float PlayerProxy::getLossRate(MediaSource &sender, TrackType type) {
|
||||
return getPacketLossRate(type);
|
||||
}
|
||||
|
||||
toolkit::EventPoller::Ptr PlayerProxy::getOwnerPoller(MediaSource &sender) {
|
||||
return getPoller();
|
||||
}
|
||||
|
||||
TranslationInfo PlayerProxy::getTranslationInfo() {
|
||||
return _transtalion_info;
|
||||
}
|
||||
|
||||
@@ -151,6 +151,7 @@ private:
|
||||
std::string getOriginUrl(MediaSource &sender) const override;
|
||||
std::shared_ptr<toolkit::SockInfo> getOriginSock(MediaSource &sender) const override;
|
||||
float getLossRate(MediaSource &sender, TrackType type) override;
|
||||
toolkit::EventPoller::Ptr getOwnerPoller(MediaSource &sender) override;
|
||||
|
||||
void rePlay(const std::string &strUrl, int iFailedCnt);
|
||||
void onPlaySuccess();
|
||||
|
||||
Reference in New Issue
Block a user