commit d227522f573d74ba0d088dfaba7aadbcf4287871
author sakal <sakal@webrtc.org> Mon Oct 03 08:54:39 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 03 15:54:44 2016 +0000
tree 65ee36812986dd8b927b18e7bb30860931856361
parent 8f9010631ca43e4838f527a8bedfa1c8cda50f77

Change DCHECK in VCMDecodedFrameCallback back to just logging.

This DCHECK is triggered by org.webrtc.PeerConnectionTest#testTrackRemoval.

BUG=webrtc:6465

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

webrtc/modules/video_coding/generic_decoder.cc

diff --git a/webrtc/modules/video_coding/generic_decoder.cc b/webrtc/modules/video_coding/generic_decoder.cc
index 48bf237..b95571b 100644
--- a/webrtc/modules/video_coding/generic_decoder.cc
+++ b/webrtc/modules/video_coding/generic_decoder.cc
@@ -59,7 +59,6 @@
     frameInfo = _timestampMap.Pop(decodedImage.timestamp());
     callback = _receiveCallback;
   }
-  RTC_DCHECK(callback != nullptr);
 
   if (frameInfo == NULL) {
     LOG(LS_WARNING) << "Too many frames backed up in the decoder, dropping "
@@ -77,7 +76,13 @@
 
   decodedImage.set_render_time_ms(frameInfo->renderTimeMs);
   decodedImage.set_rotation(frameInfo->rotation);
-  callback->FrameToRender(decodedImage);
+  // TODO(sakal): Investigate why callback is NULL sometimes and replace if
+  // statement with a DCHECK.
+  if (callback) {
+    callback->FrameToRender(decodedImage);
+  } else {
+    LOG(LS_WARNING) << "No callback, dropping frame.";
+  }
   return WEBRTC_VIDEO_CODEC_OK;
 }