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

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

Issue 2442273002: cl for resolving cq issues
Patch Set: rtebase Created 3 years, 8 months 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
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.h ('k') | content/test/data/media/depth_stream_test_utilities.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 98f53696015e6367e7efca0d852566b36c38d788..bad67c7b92f0e7dbb6540faa2c8917a09af875a4 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -604,6 +604,7 @@ bool WebMediaPlayerMS::CopyVideoTextureToPlatformTexture(
bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID,
unsigned target,
gpu::gles2::GLES2Interface* gl,
+ unsigned int texture,
int level,
int internalformat,
unsigned format,
@@ -625,9 +626,14 @@ bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID,
}
if (functionID == kTexImage2D) {
+ auto* provider =
+ RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
+ // GPU Process crashed.
+ if (!provider)
+ return false;
return media::SkCanvasVideoRenderer::TexImage2D(
- target, gl, video_frame.get(), level, internalformat, format, type,
- flip_y, premultiply_alpha);
+ target, texture, gl, provider->ContextCapabilities(), video_frame.get(),
+ level, internalformat, format, type, flip_y, premultiply_alpha);
} else if (functionID == kTexSubImage2D) {
return media::SkCanvasVideoRenderer::TexSubImage2D(
target, gl, video_frame.get(), level, format, type, xoffset, yoffset,
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.h ('k') | content/test/data/media/depth_stream_test_utilities.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698