Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: content/renderer/media/video_capture_impl.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index f9e13b6c293569df036996cd69a084aaf49081dc..31f92389e6ad075b06713b06107de4ae531f25bf 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -374,7 +374,12 @@ void VideoCaptureImpl::OnBufferReceived(
NOTREACHED();
break;
}
- DCHECK(frame);
+ if (!frame) {
+ DLOG(ERROR) << "Couldn't create video frame";
+ Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id,
+ gpu::SyncToken(), -1.0));
+ return;
+ }
frame->metadata()->SetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
timestamp);

Powered by Google App Engine
This is Rietveld 408576698