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

Change DCHECK in VCMDecodedFrameCallback back to just logging.

Browse Source 
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}
This commit is contained in:
sakal
2016-10-03 08:54:39 -07:00
committed by Commit bot
parent 8f9010631c
commit d227522f57
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/video_coding/generic_decoder.cc
View File

@ -59,7 +59,6 @@ int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
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 @@ int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
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;
}