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

Unified Diff: content/common/gpu/media/rendering_helper_egl.cc

Issue 10392141: Plumb texture target to VideoDecodeAccelerator::Client (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build Created 8 years, 6 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/common/gpu/media/rendering_helper.h ('k') | content/common/gpu/media/rendering_helper_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/rendering_helper_egl.cc
diff --git a/content/common/gpu/media/rendering_helper_egl.cc b/content/common/gpu/media/rendering_helper_egl.cc
index 17f2173467d9021a2fe96129b991cdc3513221e3..dc1530968f504c8dbf205144b07abc0711ee1256 100644
--- a/content/common/gpu/media/rendering_helper_egl.cc
+++ b/content/common/gpu/media/rendering_helper_egl.cc
@@ -57,6 +57,7 @@ class RenderingHelperEGL : public RenderingHelper {
base::WaitableEvent* done) OVERRIDE;
virtual void UnInitialize(base::WaitableEvent* done) OVERRIDE;
virtual void CreateTexture(int window_id,
+ uint32 texture_target,
uint32* texture_id,
base::WaitableEvent* done) OVERRIDE;
virtual void RenderTexture(uint32 texture_id) OVERRIDE;
@@ -245,15 +246,17 @@ void RenderingHelperEGL::UnInitialize(base::WaitableEvent* done) {
}
void RenderingHelperEGL::CreateTexture(int window_id,
+ uint32 texture_target,
uint32* texture_id,
base::WaitableEvent* done) {
if (MessageLoop::current() != message_loop_) {
message_loop_->PostTask(
FROM_HERE,
base::Bind(&RenderingHelper::CreateTexture, base::Unretained(this),
- window_id, texture_id, done));
+ window_id, texture_target, texture_id, done));
return;
}
+ CHECK_EQ(static_cast<uint32>(GL_TEXTURE_2D), texture_target);
CHECK(eglMakeCurrent(egl_display_, egl_surfaces_[window_id],
egl_surfaces_[window_id], egl_context_))
<< eglGetError();
« no previous file with comments | « content/common/gpu/media/rendering_helper.h ('k') | content/common/gpu/media/rendering_helper_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698