external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Cache RTP packet vector

Browse source
This commit is contained in:
winlin 2020-04-15 21:59:27 +08:00
parent d692f2d9c4
commit c96ffd272c
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trunk/auto/depends.sh
View file

@ -214,15 +214,16 @@ function OSX_prepare()
fi fi
OS_IS_OSX=YES OS_IS_OSX=YES
echo "OSX detected, install tools if needed"
# requires the osx when os # requires the osx when os
if [ $OS_IS_OSX = YES ]; then if [ $OS_IS_OSX = YES ]; then
if [ $SRS_OSX = NO ]; then if [ $SRS_OSX = NO ]; then
echo "OSX detected, must specifies the --osx" echo "OSX detected, please use: ./configure --osx"
exit 1 exit 1
fi fi
fi fi
echo "OSX detected, install tools if needed"
brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
echo "install brew" echo "install brew"
echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"" echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""

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

@ -460,10 +460,10 @@ srs_error_t SrsDtlsSession::unprotect_rtcp(char* out_buf, const char* in_buf, in
return srs_error_new(ERROR_RTC_SRTP_UNPROTECT, "rtcp unprotect failed"); return srs_error_new(ERROR_RTC_SRTP_UNPROTECT, "rtcp unprotect failed");
} }
SrsRtcPackets::SrsRtcPackets(bool gso, bool merge_nalus) SrsRtcPackets::SrsRtcPackets()
{ {
use_gso = gso; use_gso = false;
should_merge_nalus = merge_nalus; should_merge_nalus = false;
nn_rtp_pkts = 0; nn_rtp_pkts = 0;
nn_audios = nn_extras = 0; nn_audios = nn_extras = 0;
@ -473,6 +473,14 @@ SrsRtcPackets::SrsRtcPackets(bool gso, bool merge_nalus)
SrsRtcPackets::~SrsRtcPackets() SrsRtcPackets::~SrsRtcPackets()
{ {
reset(use_gso, should_merge_nalus);
}
void SrsRtcPackets::reset(bool gso, bool merge_nalus)
{
use_gso = gso;
should_merge_nalus = merge_nalus;
vector<SrsRtpPacket2*>::iterator it; vector<SrsRtpPacket2*>::iterator it;
for (it = packets.begin(); it != packets.end(); ++it ) { for (it = packets.begin(); it != packets.end(); ++it ) {
SrsRtpPacket2* packet = *it; SrsRtpPacket2* packet = *it;
@ -621,6 +629,7 @@ srs_error_t SrsRtcSenderThread::cycle()
bool realtime = _srs_config->get_realtime_enabled(req->vhost, true); bool realtime = _srs_config->get_realtime_enabled(req->vhost, true);
srs_utime_t mw_sleep = _srs_config->get_mw_sleep(req->vhost, true); srs_utime_t mw_sleep = _srs_config->get_mw_sleep(req->vhost, true);
SrsRtcPackets pkts;
SrsMessageArray msgs(SRS_PERF_MW_MSGS); SrsMessageArray msgs(SRS_PERF_MW_MSGS);
SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_play(); SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_play();
@ -656,11 +665,14 @@ srs_error_t SrsRtcSenderThread::cycle()
continue; continue;
} }
SrsRtcPackets pkts(gso, merge_nalus); // Transmux and send out messages.
pkts.reset(gso, merge_nalus);
if ((err = send_messages(sendonly_ukt, source, msgs.msgs, msg_count, pkts)) != srs_success) { if ((err = send_messages(sendonly_ukt, source, msgs.msgs, msg_count, 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);
} }
// Do cleanup messages.
for (int i = 0; i < msg_count; i++) { for (int i = 0; i < msg_count; i++) {
SrsSharedPtrMessage* msg = msgs.msgs[i]; SrsSharedPtrMessage* msg = msgs.msgs[i];
srs_freep(msg); srs_freep(msg);

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

@ -143,8 +143,10 @@ public:
public: public:
std::vector<SrsRtpPacket2*> packets; std::vector<SrsRtpPacket2*> packets;
public: public:
SrsRtcPackets(bool gso, bool merge_nalus); SrsRtcPackets();
virtual ~SrsRtcPackets(); virtual ~SrsRtcPackets();
public:
void reset(bool gso, bool merge_nalus);
}; };
class SrsRtcSenderThread : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler class SrsRtcSenderThread : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler