zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy payload data when inserting packets into video_coding::PacketBuffer.

Browse Source 
The payload pointed to by |dataPtr| is volatile and needs to be copied
to its own buffer.

BUG=webrtc:5514
R=brandtr@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/2302763002 .

Cr-Commit-Position: refs/heads/master@{#14321}
This commit is contained in:
philipel
2016-09-21 11:27:47 +02:00
parent 66492210e5
commit 1f39ba1cd9
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/video_coding/packet_buffer.cc
View File

@ -90,6 +90,16 @@ bool PacketBuffer::InsertPacket(const VCMPacket& packet) {
sequence_buffer_[index].used = true;
data_buffer_[index] = packet;
// Since the data pointed to by |packet.dataPtr| is non-persistent the
// data has to be copied to its own buffer.
// TODO(philipel): Take ownership instead of copying payload when
// bitstream-fixing has been implemented.
if (packet.sizeBytes) {
uint8_t* payload = new uint8_t[packet.sizeBytes];
memcpy(payload, packet.dataPtr, packet.sizeBytes);
data_buffer_[index].dataPtr = payload;
}
FindFrames(seq_num);
return true;
}
@ -99,7 +109,9 @@ void PacketBuffer::ClearTo(uint16_t seq_num) {
size_t index = first_seq_num_ % size_;
while (AheadOf<uint16_t>(seq_num, first_seq_num_ + 1)) {
index = (index + 1) % size_;
first_seq_num_ = Add<1 << 16>(first_seq_num_, 1);
++first_seq_num_;
delete[] data_buffer_[index].dataPtr;
data_buffer_[index].dataPtr = nullptr;
sequence_buffer_[index].used = false;
}
}
@ -191,8 +203,11 @@ void PacketBuffer::ReturnFrame(RtpFrameObject* frame) {
size_t end = (frame->last_seq_num() + 1) % size_;
uint16_t seq_num = frame->first_seq_num();
while (index != end) {
if (sequence_buffer_[index].seq_num == seq_num)
if (sequence_buffer_[index].seq_num == seq_num) {
delete[] data_buffer_[index].dataPtr;
data_buffer_[index].dataPtr = nullptr;
sequence_buffer_[index].used = false;
}
index = (index + 1) % size_;
++seq_num;