external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refactor RTP sender

Browse source
This commit is contained in:
winlin 2020-04-13 15:37:32 +08:00
parent 756826756a
commit 048301d9eb
2 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

80
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -581,7 +581,7 @@ srs_error_t SrsRtcSenderThread::cycle()
} }
int nn_rtp_pkts = 0; int nn_rtp_pkts = 0;
if ((err = send_messages(source, msgs.msgs, msg_count, sendonly_ukt, &nn_rtp_pkts)) != srs_success) { if ((err = send_messages(sendonly_ukt, source, msgs.msgs, msg_count, &nn_rtp_pkts)) != srs_success) {
srs_warn("send err %s", srs_error_summary(err).c_str()); srs_error_reset(err); srs_warn("send err %s", srs_error_summary(err).c_str()); srs_error_reset(err);
} }
@ -601,8 +601,7 @@ srs_error_t SrsRtcSenderThread::cycle()
} }
srs_error_t SrsRtcSenderThread::send_messages( srs_error_t SrsRtcSenderThread::send_messages(
SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsUdpMuxSocket* skt, SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, int* pnn_rtp_pkts
SrsUdpMuxSocket* skt, int* pnn_rtp_pkts
) { ) {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -620,13 +619,12 @@ srs_error_t SrsRtcSenderThread::send_messages(
return err; return err;
} }
// Send out RTP packets
*pnn_rtp_pkts += (int)packets.size(); *pnn_rtp_pkts += (int)packets.size();
err = send_packets(skt, packets);
for (int j = 0; j < (int)packets.size(); j++) { for (int j = 0; j < (int)packets.size(); j++) {
SrsRtpPacket2* packet = packets[j]; SrsRtpPacket2* packet = packets[j];
if ((err = send_packet(packet, skt)) != srs_success) {
srs_warn("send err %s", srs_error_summary(err).c_str()); srs_error_reset(err);
}
srs_freep(packet); srs_freep(packet);
} }
@ -695,48 +693,52 @@ srs_error_t SrsRtcSenderThread::messages_to_packets(
return err; return err;
} }
srs_error_t SrsRtcSenderThread::send_packet(SrsRtpPacket2* pkt, SrsUdpMuxSocket* skt) srs_error_t SrsRtcSenderThread::send_packets(SrsUdpMuxSocket* skt, vector<SrsRtpPacket2*>& packets)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
ISrsUdpSender* sender = skt->sender(); for (vector<SrsRtpPacket2*>::iterator it = packets.begin(); it != packets.end(); ++it) {
SrsRtpPacket2* packet = *it;
ISrsUdpSender* sender = skt->sender();
// Fetch a cached message from queue. // Fetch a cached message from queue.
// TODO: FIXME: Maybe encrypt in async, so the state of mhdr maybe not ready. // TODO: FIXME: Maybe encrypt in async, so the state of mhdr maybe not ready.
mmsghdr* mhdr = NULL; mmsghdr* mhdr = NULL;
if ((err = sender->fetch(&mhdr)) != srs_success) { if ((err = sender->fetch(&mhdr)) != srs_success) {
return srs_error_wrap(err, "fetch msghdr"); return srs_error_wrap(err, "fetch msghdr");
}
char* buf = (char*)mhdr->msg_hdr.msg_iov->iov_base;
int length = kRtpPacketSize;
// Marshal packet to bytes.
if (true) {
SrsBuffer stream(buf, length);
if ((err = pkt->encode(&stream)) != srs_success) {
return srs_error_wrap(err, "encode packet");
} }
length = stream.pos(); char* buf = (char*)mhdr->msg_hdr.msg_iov->iov_base;
} int length = kRtpPacketSize;
// Whether encrypt the RTP bytes. // Marshal packet to bytes.
if (rtc_session->encrypt) { if (true) {
if ((err = rtc_session->dtls_session->protect_rtp2(buf, &length)) != srs_success) { SrsBuffer stream(buf, length);
return srs_error_wrap(err, "srtp protect"); if ((err = packet->encode(&stream)) != srs_success) {
return srs_error_wrap(err, "encode packet");
}
length = stream.pos();
}
// Whether encrypt the RTP bytes.
if (rtc_session->encrypt) {
if ((err = rtc_session->dtls_session->protect_rtp2(buf, &length)) != srs_success) {
return srs_error_wrap(err, "srtp protect");
}
}
sockaddr_in* addr = (sockaddr_in*)skt->peer_addr();
socklen_t addrlen = (socklen_t)skt->peer_addrlen();
mhdr->msg_hdr.msg_name = (sockaddr_in*)addr;
mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen;
mhdr->msg_hdr.msg_iov->iov_len = length;
mhdr->msg_len = 0;
if ((err = sender->sendmmsg(mhdr)) != srs_success) {
return srs_error_wrap(err, "send msghdr");
} }
} }
sockaddr_in* addr = (sockaddr_in*)skt->peer_addr();
socklen_t addrlen = (socklen_t)skt->peer_addrlen();
mhdr->msg_hdr.msg_name = (sockaddr_in*)addr;
mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen;
mhdr->msg_hdr.msg_iov->iov_len = length;
mhdr->msg_len = 0;
if ((err = sender->sendmmsg(mhdr)) != srs_success) {
return srs_error_wrap(err, "send msghdr");
}
return err; return err;
} }

4
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -152,9 +152,9 @@ public:
public: public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
srs_error_t send_messages(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsUdpMuxSocket* skt, int* pnn_rtp_pkts); srs_error_t send_messages(SrsUdpMuxSocket* skt, SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, int* pnn_rtp_pkts);
srs_error_t messages_to_packets(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, std::vector<SrsRtpPacket2*>& packets); srs_error_t messages_to_packets(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, std::vector<SrsRtpPacket2*>& packets);
srs_error_t send_packet(SrsRtpPacket2* pkt, SrsUdpMuxSocket* skt); srs_error_t send_packets(SrsUdpMuxSocket* skt, std::vector<SrsRtpPacket2*>& packets);
private: private:
srs_error_t packet_opus(SrsSample* sample, SrsRtpPacket2** ppacket); srs_error_t packet_opus(SrsSample* sample, SrsRtpPacket2** ppacket);
private: private: