Dont request keyframes if the stream is inactive or if we are currently receiving a keyframe.
BUG=webrtc:7520
Review-Url: https://codereview.webrtc.org/2853503002
Cr-Commit-Position: refs/heads/master@{#18199}
diff --git a/webrtc/modules/video_coding/packet_buffer.cc b/webrtc/modules/video_coding/packet_buffer.cc
index ff013e0..6c3cfac 100644
--- a/webrtc/modules/video_coding/packet_buffer.cc
+++ b/webrtc/modules/video_coding/packet_buffer.cc
@@ -59,6 +59,7 @@
std::vector<std::unique_ptr<RtpFrameObject>> found_frames;
{
rtc::CritScope lock(&crit_);
+
uint16_t seq_num = packet->seqNum;
size_t index = seq_num % size_;
@@ -107,6 +108,11 @@
data_buffer_[index] = *packet;
packet->dataPtr = nullptr;
+ int64_t now_ms = clock_->TimeInMilliseconds();
+ last_received_packet_ms_ = rtc::Optional<int64_t>(now_ms);
+ if (packet->frameType == kVideoFrameKey)
+ last_received_keyframe_packet_ms_ = rtc::Optional<int64_t>(now_ms);
+
found_frames = FindFrames(seq_num);
}
@@ -143,6 +149,18 @@
first_packet_received_ = false;
is_cleared_to_first_seq_num_ = false;
+ last_received_packet_ms_ = rtc::Optional<int64_t>();
+ last_received_keyframe_packet_ms_ = rtc::Optional<int64_t>();
+}
+
+rtc::Optional<int64_t> PacketBuffer::LastReceivedPacketMs() const {
+ rtc::CritScope lock(&crit_);
+ return last_received_packet_ms_;
+}
+
+rtc::Optional<int64_t> PacketBuffer::LastReceivedKeyframePacketMs() const {
+ rtc::CritScope lock(&crit_);
+ return last_received_keyframe_packet_ms_;
}
bool PacketBuffer::ExpandBufferSize() {