diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc index cf10a45d40..84a9bb3543 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc @@ -171,11 +171,6 @@ bool IsKeyFrameAndUnspecifiedResolution(const EncodedFrame& frame) { frame.EncodedImage()._encodedHeight == 0; } -// TODO(https://bugs.webrtc.org/9974): Consider removing this workaround. -// Maximum time between frames before resetting the FrameBuffer to avoid RTP -// timestamps wraparound to affect FrameBuffer. -constexpr TimeDelta kInactiveStreamThreshold = TimeDelta::Minutes(10); - std::string OptionalDelayToLogString(const absl::optional opt) { return opt.has_value() ? ToLogString(*opt) : ""; } @@ -717,17 +712,6 @@ void VideoReceiveStream2::RequestKeyFrame(Timestamp now) { void VideoReceiveStream2::OnCompleteFrame(std::unique_ptr frame) { RTC_DCHECK_RUN_ON(&worker_sequence_checker_); - // TODO(https://bugs.webrtc.org/9974): Consider removing this workaround. - // TODO(https://bugs.webrtc.org/13343): Remove this check when FrameBuffer3 is - // deployed. With FrameBuffer3, this case is properly handled and tested in - // the FrameBufferProxyTest.PausedStream unit test. - Timestamp time_now = clock_->CurrentTime(); - if (last_complete_frame_time_ && - time_now - *last_complete_frame_time_ > kInactiveStreamThreshold) { - frame_buffer_->Clear(); - } - last_complete_frame_time_ = time_now; - const VideoPlayoutDelay& playout_delay = frame->EncodedImage().playout_delay_; if (playout_delay.min_ms >= 0) { frame_minimum_playout_delay_ = TimeDelta::Millis(playout_delay.min_ms); diff --git a/video/video_receive_stream2.h b/video/video_receive_stream2.h index 686e3af52a..6410434a36 100644 --- a/video/video_receive_stream2.h +++ b/video/video_receive_stream2.h @@ -275,8 +275,6 @@ class VideoReceiveStream2 absl::optional last_keyframe_request_ RTC_GUARDED_BY(decode_queue_); - absl::optional last_complete_frame_time_ - RTC_GUARDED_BY(worker_sequence_checker_); // Keyframe request intervals are configurable through field trials. TimeDelta max_wait_for_keyframe_ RTC_GUARDED_BY(decode_queue_);