| Index: modules/video_coding/frame_buffer2.cc
|
| diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
|
| index 50c3763dc1ae687c82713b293ae51c49a07f155b..27606e6cff6cefa9546dbcd1b2956dd30d30ff42 100644
|
| --- a/modules/video_coding/frame_buffer2.cc
|
| +++ b/modules/video_coding/frame_buffer2.cc
|
| @@ -66,14 +66,14 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
|
| clock_->TimeInMilliseconds() + max_wait_time_ms;
|
| int64_t wait_ms = max_wait_time_ms;
|
| int64_t now_ms = 0;
|
| -
|
| do {
|
| now_ms = clock_->TimeInMilliseconds();
|
| {
|
| rtc::CritScope lock(&crit_);
|
| new_continuous_frame_event_.Reset();
|
| - if (stopped_)
|
| + if (stopped_) {
|
| return kStopped;
|
| + }
|
|
|
| wait_ms = max_wait_time_ms;
|
|
|
| @@ -170,7 +170,7 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
|
| last_decoded_frame_key.picture_id == frame_key.picture_id &&
|
| last_decoded_frame_key.spatial_layer < frame_key.spatial_layer;
|
|
|
| - if (AheadOrAt(last_decoded_frame_timestamp_, frame->timestamp) &&
|
| + if (AheadOf(last_decoded_frame_timestamp_, frame->timestamp) &&
|
| !frame_is_higher_spatial_layer_of_last_decoded_frame) {
|
| // TODO(brandtr): Consider clearing the entire buffer when we hit
|
| // these conditions.
|
| @@ -342,7 +342,6 @@ int FrameBuffer::InsertFrame(std::unique_ptr<FrameObject> frame) {
|
| ClearFramesAndHistory();
|
| last_continuous_picture_id = -1;
|
| }
|
| -
|
| auto info = frames_.insert(std::make_pair(key, FrameInfo())).first;
|
|
|
| if (info->second.frame) {
|
| @@ -415,7 +414,7 @@ void FrameBuffer::PropagateDecodability(const FrameInfo& info) {
|
| RTC_DCHECK(ref_info != frames_.end());
|
| // TODO(philipel): Look into why we've seen this happen.
|
| if (ref_info != frames_.end()) {
|
| - RTC_DCHECK_GT(ref_info->second.num_missing_decodable, 0U);
|
| + // RTC_DCHECK_GT(ref_info->second.num_missing_decodable, 0U);
|
| --ref_info->second.num_missing_decodable;
|
| }
|
| }
|
|
|