Chromium Code Reviews| Index: media/blink/webmediaplayer_impl.cc |
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc |
| index 2726552c4e18816ee0ea83d0fe5816fa9f60c524..f07f671e9096b935db701654ab286093fcb18071 100644 |
| --- a/media/blink/webmediaplayer_impl.cc |
| +++ b/media/blink/webmediaplayer_impl.cc |
| @@ -629,12 +629,12 @@ unsigned WebMediaPlayerImpl::videoDecodedByteCount() const { |
| bool WebMediaPlayerImpl::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", "WebMediaPlayerImpl:copyVideoTextureToPlatformTexture"); |
| + DCHECK((params.copyType == CopyVideoTextureParams::FullCopy && |
| + !params.xoffset && !params.yoffset) || |
| + (params.copyType == CopyVideoTextureParams::SubCopy && |
| + !params.internalFormat && !params.type)); |
| scoped_refptr<VideoFrame> video_frame = GetCurrentFrameFromCompositor(); |
| @@ -649,8 +649,13 @@ bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture( |
| static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context) |
| ->GetGLInterface(); |
| SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture( |
| - gl, video_frame.get(), texture, internal_format, type, premultiply_alpha, |
| - flip_y); |
| + gl, video_frame.get(), |
| + {params.copyType == CopyVideoTextureParams::FullCopy |
|
DaleCurtis
2015/10/21 18:35:50
:)
|
| + ? SkCanvasVideoRenderer::CopyFrameSingleTextureParams::FullCopy |
| + : SkCanvasVideoRenderer::CopyFrameSingleTextureParams::SubCopy, |
| + params.target, params.texture, params.internalFormat, params.type, |
| + params.level, params.xoffset, params.yoffset, params.premultiplyAlpha, |
| + params.flipY}); |
| return true; |
| } |