admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove workaround for long video pauses.

Browse Source 
This behaviour has been fixed with the introduction of FrameBuffer3

Bug: webrtc:14033, webrtc:13343, webrtc:9974
Change-Id: Iba81c169706336e85194ed141324466e44a2c859
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265867
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37742}
This commit is contained in:
Evan Shrubsole 2022-08-10 16:08:48 +00:00 committed by WebRTC LUCI CQ
parent 1e688612cc
commit 4317b02f66
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
video/video_receive_stream2.cc
View File

@ -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<TimeDelta> opt) {
return opt.has_value() ? ToLogString(*opt) : "<unset>";
}
@ -717,17 +712,6 @@ void VideoReceiveStream2::RequestKeyFrame(Timestamp now) {
void VideoReceiveStream2::OnCompleteFrame(std::unique_ptr<EncodedFrame> 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);

2
video/video_receive_stream2.h
View File

@ -275,8 +275,6 @@ class VideoReceiveStream2
absl::optional<Timestamp> last_keyframe_request_
RTC_GUARDED_BY(decode_queue_);
absl::optional<Timestamp> 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_);