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

RTC: Refine RTP packet api, keep shared message to private

Browse source
This commit is contained in:
winlin 2021-02-26 12:25:35 +08:00
parent 0cb125e53d
commit b2d546156e
7 changed files with 50 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -818,12 +818,8 @@ srs_error_t SrsRtcFromRtmpBridger::package_opus(char* data, int size, SrsRtpPack
SrsRtpRawPayload* raw = new SrsRtpRawPayload();
pkt->payload = raw;
raw->payload = new char[size];
raw->payload = pkt->wrap(data, size);
raw->nn_payload = size;
memcpy(raw->payload, data, size);
pkt->shared_msg = new SrsSharedPtrMessage();
pkt->shared_msg->wrap(raw->payload, size);
*ppkt = pkt;
@ -964,9 +960,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_stap_a(SrsRtcStream* source, SrsShare
// Copy the SPS/PPS bytes, because it may change.
int size = (int)(sps.size() + pps.size());
char* payload = new char[size];
pkt->shared_msg = new SrsSharedPtrMessage();
pkt->shared_msg->wrap(payload, size);
char* payload = pkt->wrap(size);
if (true) {
SrsSample* sample = new SrsSample();
@ -1038,7 +1032,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const
pkt->header.set_sequence(video_sequence++);
pkt->header.set_timestamp(msg->timestamp * 90);
pkt->payload = raw;
pkt->shared_msg = msg->copy();
pkt->wrap(msg);
pkts.push_back(pkt);
} else {
// We must free it, should never use RTP packets to free it,
@ -1077,7 +1071,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const
fua->end = bool(i == num_of_packet - 1);
pkt->payload = fua;
pkt->shared_msg = msg->copy();
pkt->wrap(msg);
pkts.push_back(pkt);
nb_left -= packet_size;
@ -1105,7 +1099,8 @@ srs_error_t SrsRtcFromRtmpBridger::package_single_nalu(SrsSharedPtrMessage* msg,
raw->payload = sample->bytes;
raw->nn_payload = sample->size;
pkt->shared_msg = msg->copy();
pkt->wrap(msg);
pkts.push_back(pkt);
return err;
@ -1142,7 +1137,8 @@ srs_error_t SrsRtcFromRtmpBridger::package_fu_a(SrsSharedPtrMessage* msg, SrsSam
fua->payload = p;
fua->size = packet_size;
pkt->shared_msg = msg->copy();
pkt->wrap(msg);
pkts.push_back(pkt);
p += packet_size;