| 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 d7df906d922f5184bd97c93d34db7270097154fd..dcd8e330d67676d80b87e72368e8791778c3bdd4 100644
|
| --- a/media/gpu/dxva_picture_buffer_win.cc
|
| +++ b/media/gpu/dxva_picture_buffer_win.cc
|
| @@ -530,7 +530,7 @@ bool EGLStreamPictureBuffer::BindSampleToTexture(
|
| result = eglStreamConsumerAcquireKHR(egl_display, stream_);
|
| RETURN_ON_FAILURE(result, "Could not post acquire stream", false);
|
| gl::GLImageDXGI* gl_image_dxgi =
|
| - gl::GLImageDXGI::FromGLImage(gl_image_.get());
|
| + static_cast<gl::GLImageDXGI*>(gl_image_.get());
|
| DCHECK(gl_image_dxgi);
|
|
|
| gl_image_dxgi->SetTexture(dx11_decoding_texture_, subresource);
|
| @@ -646,14 +646,13 @@ bool EGLStreamDelayedCopyPictureBuffer::BindSampleToTexture(
|
| DCHECK(decoder->d3d11_processor_);
|
| DCHECK(decoder->enumerator_);
|
|
|
| - gl::GLImageDXGI* gl_image_dxgi =
|
| - gl::GLImageDXGI::FromGLImage(gl_image_.get());
|
| + gl::CopyingGLImageDXGI* gl_image_dxgi =
|
| + static_cast<gl::CopyingGLImageDXGI*>(gl_image_.get());
|
| DCHECK(gl_image_dxgi);
|
|
|
| gl_image_dxgi->SetTexture(dx11_decoding_texture_, subresource);
|
| - return static_cast<gl::CopyingGLImageDXGI*>(gl_image_dxgi)
|
| - ->InitializeVideoProcessor(decoder->d3d11_processor_,
|
| - decoder->enumerator_);
|
| + return gl_image_dxgi->InitializeVideoProcessor(decoder->d3d11_processor_,
|
| + decoder->enumerator_);
|
| }
|
|
|
| bool EGLStreamDelayedCopyPictureBuffer::AllowOverlay() const {
|
| @@ -802,7 +801,7 @@ bool EGLStreamCopyPictureBuffer::CopySurfaceComplete(
|
| result = eglStreamConsumerAcquireKHR(egl_display, stream_);
|
| RETURN_ON_FAILURE(result, "Could not post acquire stream", false);
|
| gl::GLImageDXGI* gl_image_dxgi =
|
| - gl::GLImageDXGI::FromGLImage(gl_image_.get());
|
| + static_cast<gl::GLImageDXGI*>(gl_image_.get());
|
| DCHECK(gl_image_dxgi);
|
|
|
| gl_image_dxgi->SetTexture(angle_copy_texture_, 0);
|
|
|