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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 2820823003: Revert "Fix the size of video textures uploaded to WebGL." (Closed)
Patch Set: 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 | « media/blink/webmediaplayer_impl.h ('k') | media/renderers/skcanvas_video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 545363560a98f971971e7a6a4a7ee6747ec6d82b..94adf818ab2555ec3429edc99cdd337fa31df68a 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -958,6 +958,8 @@ size_t WebMediaPlayerImpl::videoDecodedByteCount() const {
bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
gpu::gles2::GLES2Interface* gl,
unsigned int texture,
+ unsigned int internal_format,
+ unsigned int type,
bool premultiply_alpha,
bool flip_y) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -978,7 +980,8 @@ bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
if (!context_3d_cb_.is_null())
context_3d = context_3d_cb_.Run();
return skcanvas_video_renderer_.CopyVideoFrameTexturesToGLTexture(
- context_3d, gl, video_frame.get(), texture, premultiply_alpha, flip_y);
+ context_3d, gl, video_frame.get(), texture, internal_format, type,
+ premultiply_alpha, flip_y);
}
void WebMediaPlayerImpl::setContentDecryptionModule(
« no previous file with comments | « media/blink/webmediaplayer_impl.h ('k') | media/renderers/skcanvas_video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698