Break backwards traversal loop if we have looped around all packets in the PacketBuffer for H264 frames.
BUG=webrtc:7532
Review-Url: https://codereview.webrtc.org/2868723003
Cr-Commit-Position: refs/heads/master@{#18191}
diff --git a/webrtc/modules/video_coding/packet_buffer.cc b/webrtc/modules/video_coding/packet_buffer.cc
index 3b0d09f..ff013e0 100644
--- a/webrtc/modules/video_coding/packet_buffer.cc
+++ b/webrtc/modules/video_coding/packet_buffer.cc
@@ -197,8 +197,7 @@
std::vector<std::unique_ptr<RtpFrameObject>> PacketBuffer::FindFrames(
uint16_t seq_num) {
std::vector<std::unique_ptr<RtpFrameObject>> found_frames;
- size_t packets_tested = 0;
- while (packets_tested < size_ && PotentialNewFrame(seq_num)) {
+ for (size_t i = 0; i < size_ && PotentialNewFrame(seq_num); ++i) {
size_t index = seq_num % size_;
sequence_buffer_[index].continuous = true;
@@ -215,7 +214,10 @@
bool is_h264 = data_buffer_[start_index].codec == kVideoCodecH264;
int64_t frame_timestamp = data_buffer_[start_index].timestamp;
- while (true) {
+
+ // Since packet at |data_buffer_[index]| is already part of the frame
+ // we will have at most |size_ - 1| packets left to check.
+ for (size_t j = 0; j < size_ - 1; ++j) {
frame_size += data_buffer_[start_index].sizeBytes;
max_nack_count =
std::max(max_nack_count, data_buffer_[start_index].timesNacked);
@@ -232,12 +234,7 @@
// the timestamp of that packet is the same as this one. This may cause
// the PacketBuffer to hand out incomplete frames.
// See: https://bugs.chromium.org/p/webrtc/issues/detail?id=7106
- //
- // Since we ignore the |frame_begin| flag of the inserted packets
- // we check that |start_index != static_cast<int>(index)| to make sure
- // that we don't get stuck in a loop if the packet buffer is filled
- // with packets of the same timestamp.
- if (is_h264 && start_index != static_cast<int>(index) &&
+ if (is_h264 &&
(!sequence_buffer_[start_index].used ||
data_buffer_[start_index].timestamp != frame_timestamp)) {
break;
@@ -251,7 +248,6 @@
max_nack_count, clock_->TimeInMilliseconds()));
}
++seq_num;
- ++packets_tested;
}
return found_frames;
}
diff --git a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc
index 0af60b3..86d54eb 100644
--- a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc
@@ -477,5 +477,29 @@
EXPECT_EQ(0UL, frames_from_callback_.size());
}
+TEST_F(TestPacketBuffer, OneH264FrameFillBuffer) {
+ VCMPacket packet;
+ packet.seqNum = 0;
+ packet.codec = kVideoCodecH264;
+ packet.dataPtr = nullptr;
+ packet.sizeBytes = 0;
+ packet.is_first_packet_in_frame = true;
+ packet.markerBit = false;
+ packet_buffer_->InsertPacket(&packet);
+
+ packet.is_first_packet_in_frame = false;
+ for (int i = 1; i < kStartSize - 1; ++i) {
+ packet.seqNum = i;
+ packet_buffer_->InsertPacket(&packet);
+ }
+
+ packet.seqNum = kStartSize - 1;
+ packet.markerBit = true;
+ packet_buffer_->InsertPacket(&packet);
+
+ EXPECT_EQ(1UL, frames_from_callback_.size());
+ CheckFrame(0);
+}
+
} // namespace video_coding
} // namespace webrtc
