commit e95b78bd8da556fe85d1603f6ef5558e50c81189
author tommi <tommi@webrtc.org> Sun May 14 07:23:11 2017 -0700
committer Commit bot <commit-bot@chromium.org> Sun May 14 14:23:11 2017 +0000
tree a747cbd4bb5edee6be935f654536f40098d72af8
parent eadab4b5efd64b6c31d5d11249153c85aa0bd33f

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

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

Review-Url: https://codereview.webrtc.org/2879073002
Cr-Commit-Position: refs/heads/master@{#18140}

webrtc/modules/video_coding/frame_buffer2.cc

diff --git a/webrtc/modules/video_coding/frame_buffer2.cc b/webrtc/modules/video_coding/frame_buffer2.cc
index 8d86a64..584c2f0 100644
--- a/webrtc/modules/video_coding/frame_buffer2.cc
+++ b/webrtc/modules/video_coding/frame_buffer2.cc
@@ -345,11 +345,15 @@
 
 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 @@
       // 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);