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

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

Issue 2767063002: 16-bit video upload to float: intermediate R16_EXT and copy to float. (Closed)
Patch Set: Created 3 years, 9 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
Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index a3176ee9a17f1c8cd8142d10b5b816d206dfba41..d9ca13f97ee262f382cfb20c09c8cdde106f1420 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -603,6 +603,7 @@ bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
bool WebMediaPlayerMS::texImageImpl(TexImageFunctionID functionID,
unsigned target,
gpu::gles2::GLES2Interface* gl,
+ unsigned int texture,
int level,
int internalformat,
unsigned format,
@@ -624,9 +625,14 @@ bool WebMediaPlayerMS::texImageImpl(TexImageFunctionID functionID,
}
if (functionID == TexImage2D) {
+ 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 == TexSubImage2D) {
return media::SkCanvasVideoRenderer::TexSubImage2D(
target, gl, video_frame.get(), level, format, type, xoffset, yoffset,

Powered by Google App Engine
This is Rietveld 408576698