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

Unified Diff: content/renderer/render_view_impl.cc

Issue 9639005: HW video decode support for --enable-threaded-compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9f34b6c26bf5e60208b0c0051dc19894ed86fa6e..2e2baffe1aad24018c947242ac0310721d469d54 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -55,6 +55,7 @@
#include "content/renderer/dom_automation_controller.h"
#include "content/renderer/external_popup_menu.h"
#include "content/renderer/geolocation_dispatcher.h"
+#include "content/renderer/gpu/compositor_thread.h"
#include "content/renderer/idle_user_detector.h"
#include "content/renderer/web_intents_host.h"
#include "content/renderer/java/java_bridge_dispatcher.h"
@@ -2135,14 +2136,20 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
WebGraphicsContext3DCommandBufferImpl* context3d =
static_cast<WebGraphicsContext3DCommandBufferImpl*>(
webview()->graphicsContext3D());
- if (context3d && context3d->makeContextCurrent()) {
+ if (context3d) {
+ MessageLoop* factories_loop =
+ RenderThreadImpl::current()->compositor_thread() ?
+ RenderThreadImpl::current()->compositor_thread()->GetWebThread()
+ ->message_loop() :
+ MessageLoop::current();
GpuChannelHost* gpu_channel_host =
RenderThreadImpl::current()->EstablishGpuChannelSync(
content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
collection->AddVideoDecoder(new media::GpuVideoDecoder(
message_loop_factory->GetMessageLoop("GpuVideoDecoder"),
+ factories_loop,
new RendererGpuVideoDecoderFactories(
- gpu_channel_host, context3d->context()->AsWeakPtr())));
+ gpu_channel_host, factories_loop, context3d)));
}
#endif

Powered by Google App Engine
This is Rietveld 408576698