zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a couple of checks to FrameBuffer while we're continuing to look at RtpFrameReferenceFinder.

Browse Source 
BUG=chromium:679306
TBR=terelius@webrtc.org, philipel@webrtc.org

Review-Url: https://codereview.webrtc.org/2879073002
Cr-Commit-Position: refs/heads/master@{#18140}
This commit is contained in:
tommi
2017-05-14 07:23:11 -07:00
committed by Commit bot
parent eadab4b5ef
commit e95b78bd8d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/modules/video_coding/frame_buffer2.cc
View File

@ -345,11 +345,15 @@ void FrameBuffer::PropagateContinuity(FrameMap::iterator start) {
void FrameBuffer::PropagateDecodability(const FrameInfo& info) {
TRACE_EVENT0("webrtc", "FrameBuffer::PropagateDecodability");
RTC_CHECK(info.num_dependent_frames < FrameInfo::kMaxNumDependentFrames);
for (size_t d = 0; d < info.num_dependent_frames; ++d) {
auto ref_info = frames_.find(info.dependent_frames[d]);
RTC_DCHECK(ref_info != frames_.end());
RTC_DCHECK_GT(ref_info->second.num_missing_decodable, 0U);
--ref_info->second.num_missing_decodable;
// 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);
--ref_info->second.num_missing_decodable;
}
}
}
@ -418,7 +422,14 @@ bool FrameBuffer::UpdateFrameInfoWithIncomingFrame(const FrameObject& frame,
// frames are inserted or decoded.
ref_info->second.dependent_frames[ref_info->second.num_dependent_frames] =
key;
++ref_info->second.num_dependent_frames;
RTC_DCHECK_LT(ref_info->second.num_dependent_frames,
(FrameInfo::kMaxNumDependentFrames - 1));
// TODO(philipel): Look into why this could happen and handle
// appropriately.
if (ref_info->second.num_dependent_frames <
(FrameInfo::kMaxNumDependentFrames - 1)) {
++ref_info->second.num_dependent_frames;
}
}
RTC_DCHECK_LE(ref_info->second.num_missing_continuous,
ref_info->second.num_missing_decodable);