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

Unified Diff: media/gpu/dxva_picture_buffer_win.cc

Issue 2981713002: Revert of Allow presenting DXGI share handles as overlays. (Closed)
Patch Set: Created 3 years, 5 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 | « gpu/ipc/service/direct_composition_surface_win_unittest.cc ('k') | ui/gl/gl_image_dxgi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/dxva_picture_buffer_win.cc
diff --git a/media/gpu/dxva_picture_buffer_win.cc b/media/gpu/dxva_picture_buffer_win.cc
index dcd8e330d67676d80b87e72368e8791778c3bdd4..d7df906d922f5184bd97c93d34db7270097154fd 100644
--- a/media/gpu/dxva_picture_buffer_win.cc
+++ b/media/gpu/dxva_picture_buffer_win.cc
@@ -530,7 +530,7 @@
result = eglStreamConsumerAcquireKHR(egl_display, stream_);
RETURN_ON_FAILURE(result, "Could not post acquire stream", false);
gl::GLImageDXGI* gl_image_dxgi =
- static_cast<gl::GLImageDXGI*>(gl_image_.get());
+ gl::GLImageDXGI::FromGLImage(gl_image_.get());
DCHECK(gl_image_dxgi);
gl_image_dxgi->SetTexture(dx11_decoding_texture_, subresource);
@@ -646,13 +646,14 @@
DCHECK(decoder->d3d11_processor_);
DCHECK(decoder->enumerator_);
- gl::CopyingGLImageDXGI* gl_image_dxgi =
- static_cast<gl::CopyingGLImageDXGI*>(gl_image_.get());
+ gl::GLImageDXGI* gl_image_dxgi =
+ gl::GLImageDXGI::FromGLImage(gl_image_.get());
DCHECK(gl_image_dxgi);
gl_image_dxgi->SetTexture(dx11_decoding_texture_, subresource);
- return gl_image_dxgi->InitializeVideoProcessor(decoder->d3d11_processor_,
- decoder->enumerator_);
+ return static_cast<gl::CopyingGLImageDXGI*>(gl_image_dxgi)
+ ->InitializeVideoProcessor(decoder->d3d11_processor_,
+ decoder->enumerator_);
}
bool EGLStreamDelayedCopyPictureBuffer::AllowOverlay() const {
@@ -801,7 +802,7 @@
result = eglStreamConsumerAcquireKHR(egl_display, stream_);
RETURN_ON_FAILURE(result, "Could not post acquire stream", false);
gl::GLImageDXGI* gl_image_dxgi =
- static_cast<gl::GLImageDXGI*>(gl_image_.get());
+ gl::GLImageDXGI::FromGLImage(gl_image_.get());
DCHECK(gl_image_dxgi);
gl_image_dxgi->SetTexture(angle_copy_texture_, 0);
« no previous file with comments | « gpu/ipc/service/direct_composition_surface_win_unittest.cc ('k') | ui/gl/gl_image_dxgi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698