generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes a crash in the pacer where it fails to find a normal prio packet if there are no high prio packets, given that the queue has grown too large.

Browse Source 
BUG=2682
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4599005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5190 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2013-11-28 14:00:09 +00:00
parent 1f7c8d8b6a
commit b627f676b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/pacing/paced_sender.cc
View File

@ -326,6 +326,7 @@ void PacedSender::UpdateBytesPerInterval(uint32_t delta_time_ms) {
// MUST have critsect_ when calling. // MUST have critsect_ when calling.
bool PacedSender::ShouldSendNextPacket(paced_sender::PacketList** packet_list) { bool PacedSender::ShouldSendNextPacket(paced_sender::PacketList** packet_list) {
*packet_list = NULL;
if (media_budget_->bytes_remaining() <= 0) { if (media_budget_->bytes_remaining() <= 0) {
// All bytes consumed for this interval. // All bytes consumed for this interval.
// Check if we have not sent in a too long time. // Check if we have not sent in a too long time.
@ -348,8 +349,9 @@ bool PacedSender::ShouldSendNextPacket(paced_sender::PacketList** packet_list) {
high_priority_packets_->front().capture_time_ms_; high_priority_packets_->front().capture_time_ms_;
*packet_list = high_priority_packets_.get(); *packet_list = high_priority_packets_.get();
} }
if (!normal_priority_packets_->empty() && high_priority_capture_time > if (!normal_priority_packets_->empty() &&
normal_priority_packets_->front().capture_time_ms_) { (high_priority_capture_time == -1 || high_priority_capture_time >
normal_priority_packets_->front().capture_time_ms_)) {
*packet_list = normal_priority_packets_.get(); *packet_list = normal_priority_packets_.get();
} }
if (*packet_list) if (*packet_list)