Index: 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 48bf237996a9e6501405f3bad8cd30b716718493..2efdd1bc264008ba6a846bf2dc9f5e9153fe3e57 100644 |
--- a/webrtc/modules/video_coding/generic_decoder.cc |
+++ b/webrtc/modules/video_coding/generic_decoder.cc |
@@ -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,10 @@ int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage, |
decodedImage.set_render_time_ms(frameInfo->renderTimeMs); |
decodedImage.set_rotation(frameInfo->rotation); |
- callback->FrameToRender(decodedImage); |
+ if (callback) |
stefan-webrtc
2016/10/03 09:30:32
{}
|
+ callback->FrameToRender(decodedImage); |
+ else |
stefan-webrtc
2016/10/03 09:30:32
} else {
|
+ LOG(LS_WARNING) << "No callback, dropping frame."; |
return WEBRTC_VIDEO_CODEC_OK; |
} |