Index: media/blink/skcanvas_video_renderer.cc |
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc |
index 90297f7dc8f1db1321143a86659b1af5ab49357c..60fa05d0e9dd47ca800efa52989ec11933990624 100644 |
--- a/media/blink/skcanvas_video_renderer.cc |
+++ b/media/blink/skcanvas_video_renderer.cc |
@@ -125,7 +125,6 @@ skia::RefPtr<SkImage> NewSkImageFromVideoFrameYUVTextures( |
SkImage* img = SkImage::NewFromYUVTexturesCopy(context_3d.gr_context, |
color_space, handles, yuvSizes, |
kTopLeft_GrSurfaceOrigin); |
- DCHECK(img); |
gl->DeleteTextures(3, source_textures); |
return skia::AdoptRef(img); |
} |
@@ -334,7 +333,11 @@ void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame, |
auto video_generator = new VideoImageGenerator(video_frame); |
last_image_ = skia::AdoptRef(SkImage::NewFromGenerator(video_generator)); |
} |
- last_timestamp_ = video_frame->timestamp(); |
+ if (last_image_) { |
DaleCurtis
2015/09/04 21:27:09
if (!last_image_)
return;
Daniele Castagna
2015/09/04 21:31:32
Done.
|
+ last_timestamp_ = video_frame->timestamp(); |
+ } else { // Couldn't create the SkImage. |
+ return; |
+ } |
} |
last_image_deleting_timer_.Reset(); |