amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Refine(webrtc/sdp): 移除getSdp(SdpType type)。相较而言，直接使用_offer_sdp 和 _answer_sdp 更好。

Browse Source
This commit is contained in:
Johnny 2021-10-12 15:34:36 +08:00
parent 712bdf7310
commit c7633fb5bb
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/WebRtcTransport.cpp
View File

@ -137,14 +137,6 @@ void WebRtcTransport::onSendSockData(const char *buf, size_t len, bool flush){
onSendSockData(buf, len, (struct sockaddr_in *) tuple, flush); onSendSockData(buf, len, (struct sockaddr_in *) tuple, flush);
} }
const RtcSession& WebRtcTransport::getSdp(SdpType type) const{
switch (type) {
case SdpType::offer: return *_offer_sdp;
case SdpType::answer: return *_answer_sdp;
default: throw std::invalid_argument("不识别的sdp类型");
}
}
RTC::TransportTuple* WebRtcTransport::getSelectedTuple() const{ RTC::TransportTuple* WebRtcTransport::getSelectedTuple() const{
return _ice_server->GetSelectedTuple(); return _ice_server->GetSelectedTuple();
} }
@ -409,7 +401,7 @@ bool WebRtcTransportImp::canSendRtp() const{
if (!_play_src) { if (!_play_src) {
return false; return false;
} }
for (auto &m : getSdp(SdpType::answer).media) { for (auto &m : _answer_sdp->media) {
if (m.direction == RtpDirection::sendrecv || m.direction == RtpDirection::sendonly) { if (m.direction == RtpDirection::sendrecv || m.direction == RtpDirection::sendonly) {
return true; return true;
} }
@ -421,7 +413,7 @@ bool WebRtcTransportImp::canRecvRtp() const{
if (!_push_src) { if (!_push_src) {
return false; return false;
} }
for (auto &m : getSdp(SdpType::answer).media) { for (auto &m : _answer_sdp->media) {
if (m.direction == RtpDirection::sendrecv || m.direction == RtpDirection::recvonly) { if (m.direction == RtpDirection::sendrecv || m.direction == RtpDirection::recvonly) {
return true; return true;
} }
@ -431,8 +423,8 @@ bool WebRtcTransportImp::canRecvRtp() const{
void WebRtcTransportImp::onStartWebRTC() { void WebRtcTransportImp::onStartWebRTC() {
//获取ssrc和pt相关信息,届时收到rtp和rtcp时分别可以根据pt和ssrc找到相关的信息 //获取ssrc和pt相关信息,届时收到rtp和rtcp时分别可以根据pt和ssrc找到相关的信息
for (auto &m_answer : getSdp(SdpType::answer).media) { for (auto &m_answer : _answer_sdp->media) {
auto m_offer = getSdp(SdpType::offer).getMedia(m_answer.type); auto m_offer = _offer_sdp->getMedia(m_answer.type);
auto track = std::make_shared<MediaTrack>(); auto track = std::make_shared<MediaTrack>();
track->media = &m_answer; track->media = &m_answer;
@ -484,13 +476,13 @@ void WebRtcTransportImp::onStartWebRTC() {
} }
if (canRecvRtp()) { if (canRecvRtp()) {
_push_src->setSdp(getSdp(SdpType::answer).toRtspSdp()); _push_src->setSdp(_answer_sdp->toRtspSdp());
_simulcast = getSdp(SdpType::answer).supportSimulcast(); _simulcast = _answer_sdp->supportSimulcast();
} }
if (canSendRtp()) { if (canSendRtp()) {
RtcSession rtsp_send_sdp; RtcSession rtsp_send_sdp;
rtsp_send_sdp.loadFrom(_play_src->getSdp(), false); rtsp_send_sdp.loadFrom(_play_src->getSdp(), false);
for (auto &m : getSdp(SdpType::answer).media) { for (auto &m : _answer_sdp->media) {
if (m.type == TrackApplication) { if (m.type == TrackApplication) {
continue; continue;
} }
@ -886,7 +878,7 @@ void WebRtcTransportImp::onSortedRtp(MediaTrack &track, const string &rid, RtpPa
//开启remb，则发送remb包调节比特率 //开启remb，则发送remb包调节比特率
GET_CONFIG(size_t, remb_bit_rate, RTC::kRembBitRate); GET_CONFIG(size_t, remb_bit_rate, RTC::kRembBitRate);
if (remb_bit_rate && getSdp(SdpType::answer).supportRtcpFb(SdpConst::kRembRtcpFb)) { if (remb_bit_rate && _answer_sdp->supportRtcpFb(SdpConst::kRembRtcpFb)) {
sendRtcpRemb(rtp->getSSRC(), remb_bit_rate); sendRtcpRemb(rtp->getSSRC(), remb_bit_rate);
} }
} }

5
webrtc/WebRtcTransport.h
View File

@ -116,7 +116,8 @@ protected:
virtual void onBeforeEncryptRtcp(const char *buf, int &len, void *ctx) = 0; virtual void onBeforeEncryptRtcp(const char *buf, int &len, void *ctx) = 0;
protected: protected:
const RtcSession& getSdp(SdpType type) const; RtcSession::Ptr _offer_sdp;
RtcSession::Ptr _answer_sdp;
RTC::TransportTuple* getSelectedTuple() const; RTC::TransportTuple* getSelectedTuple() const;
void sendRtcpRemb(uint32_t ssrc, size_t bit_rate); void sendRtcpRemb(uint32_t ssrc, size_t bit_rate);
void sendRtcpPli(uint32_t ssrc); void sendRtcpPli(uint32_t ssrc);
@ -133,8 +134,6 @@ private:
std::shared_ptr<RTC::DtlsTransport> _dtls_transport; std::shared_ptr<RTC::DtlsTransport> _dtls_transport;
std::shared_ptr<RTC::SrtpSession> _srtp_session_send; std::shared_ptr<RTC::SrtpSession> _srtp_session_send;
std::shared_ptr<RTC::SrtpSession> _srtp_session_recv; std::shared_ptr<RTC::SrtpSession> _srtp_session_recv;
RtcSession::Ptr _offer_sdp;
RtcSession::Ptr _answer_sdp;
Ticker _ticker; Ticker _ticker;
}; };