external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

RTC: Refine publisher memory allocate, by packet itself

Browse source
This commit is contained in:
winlin 2021-02-26 11:18:15 +08:00
parent 001a6a33ce
commit 2ae7e22469
3 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1193,20 +1193,12 @@ srs_error_t SrsRtcPublishStream::on_rtp_plaintext(char* plaintext, int nb_plaint
SrsRtpPacket2* pkt = new SrsRtpPacket2();
SrsAutoFree(SrsRtpPacket2, pkt);
if (true) {
pkt->set_decode_handler(this);
pkt->set_extension_types(&extension_types_);
pkt->shared_msg = new SrsSharedPtrMessage();
char* buf = new char[nb_plaintext];
memcpy(buf, plaintext, nb_plaintext);
pkt->shared_msg->wrap(buf, nb_plaintext);
SrsBuffer b(buf, nb_plaintext);
if ((err = pkt->decode(&b)) != srs_success) {
pkt->wrap(plaintext, nb_plaintext);
if ((err = pkt->decode(pkt->cache_buffer())) != srs_success) {
return srs_error_wrap(err, "decode rtp packet");
}
}
// For source to consume packet.
uint32_t ssrc = pkt->header.get_ssrc();

20
trunk/src/kernel/srs_kernel_rtc_rtp.cpp
View file

@ -768,6 +768,7 @@ SrsRtpPacket2::SrsRtpPacket2()
nalu_type = SrsAvcNaluTypeReserved;
shared_msg = NULL;
cache_buffer_ = NULL;
frame_type = SrsFrameTypeReserved;
cached_payload_size = 0;
@ -778,6 +779,25 @@ SrsRtpPacket2::~SrsRtpPacket2()
{
srs_freep(payload);
srs_freep(shared_msg);
srs_freep(cache_buffer_);
}
void SrsRtpPacket2::wrap(char* data, int size)
{
srs_freep(shared_msg);
shared_msg = new SrsSharedPtrMessage();
char* buf = new char[size];
memcpy(buf, data, size);
shared_msg->wrap(buf, size);
srs_freep(cache_buffer_);
cache_buffer_ = new SrsBuffer(buf, size);
}
SrsBuffer* SrsRtpPacket2::cache_buffer()
{
return cache_buffer_;
}
void SrsRtpPacket2::set_padding(int size)

5
trunk/src/kernel/srs_kernel_rtc_rtp.hpp
View file

@ -268,6 +268,7 @@ class SrsRtpPacket2
public:
SrsRtpHeader header;
ISrsRtpPayloader* payload;
SrsBuffer* cache_buffer_;
// Helper fields.
public:
// The first byte as nalu type, for video decoder only.
@ -285,6 +286,10 @@ private:
public:
SrsRtpPacket2();
virtual ~SrsRtpPacket2();
public:
// Wrap buffer to shared_message, which is managed by us.
void wrap(char* data, int size);
SrsBuffer* cache_buffer();
public:
// Set the padding of RTP packet.
void set_padding(int size);