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

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

Issue 1413833006: Reland of "webgl: optimize webgl.texSubImage2D(video) path." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fold glCopySubTextureCHROMIUM bug fix into this CL Created 5 years, 2 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 586f180129ec1f748ad9e741ecc1936dcd7fdc93..85c41be698af178d2d93f9b023e53bb61d37bbbc 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -352,13 +352,13 @@ unsigned WebMediaPlayerMS::videoDecodedByteCount() const {
bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
blink::WebGraphicsContext3D* web_graphics_context,
- unsigned int texture,
- unsigned int internal_format,
- unsigned int type,
- bool premultiply_alpha,
- bool flip_y) {
+ const CopyVideoTextureParams& params) {
TRACE_EVENT0("media", "WebMediaPlayerMS:copyVideoTextureToPlatformTexture");
DCHECK(thread_checker_.CalledOnValidThread());
+ DCHECK((params.copyType == CopyVideoTextureParams::FullCopy &&
+ !params.xoffset && !params.yoffset) ||
+ (params.copyType == CopyVideoTextureParams::SubCopy &&
+ !params.internalFormat && !params.type));
scoped_refptr<media::VideoFrame> video_frame = compositor_->GetCurrentFrame();
@@ -372,9 +372,15 @@ bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
gpu::gles2::GLES2Interface* const gl =
static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
->GetGLInterface();
+ typedef media::SkCanvasVideoRenderer::CopyFrameSingleTextureParams CopyParams;
media::SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture(
- gl, video_frame.get(), texture, internal_format, type, premultiply_alpha,
- flip_y);
+ gl, video_frame.get(),
+ CopyParams(params.copyType == CopyVideoTextureParams::FullCopy
+ ? CopyParams::FullCopy
+ : CopyParams::SubCopy,
+ params.target, params.texture, params.internalFormat,
+ params.type, params.level, params.xoffset, params.yoffset,
+ params.premultiplyAlpha, params.flipY));
return true;
}

Powered by Google App Engine
This is Rietveld 408576698