| 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 4e36b91332a8705152bbf00325a491f2b5f16689..e7394567cd1b852142b7aa4f2d3b3bbd3ddb6449 100644
|
| --- a/media/gpu/dxva_picture_buffer_win.cc
|
| +++ b/media/gpu/dxva_picture_buffer_win.cc
|
| @@ -240,12 +240,12 @@ bool PbufferPictureBuffer::InitializeTexture(
|
| &desc, nullptr, dx11_decoding_texture_.Receive());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to create texture", false);
|
| if (decoder.use_keyed_mutex_) {
|
| - hr = dx11_keyed_mutex_.QueryFrom(dx11_decoding_texture_.get());
|
| + hr = dx11_keyed_mutex_.QueryFrom(dx11_decoding_texture_.Get());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to get keyed mutex", false);
|
| }
|
|
|
| base::win::ScopedComPtr<IDXGIResource> resource;
|
| - hr = resource.QueryFrom(dx11_decoding_texture_.get());
|
| + hr = resource.QueryFrom(dx11_decoding_texture_.Get());
|
| DCHECK(SUCCEEDED(hr));
|
| hr = resource->GetSharedHandle(&texture_share_handle_);
|
| RETURN_ON_FAILURE(SUCCEEDED(hr) && texture_share_handle_,
|
| @@ -286,7 +286,7 @@ bool PbufferPictureBuffer::CopyOutputSampleDataToPictureBuffer(
|
| // when we receive a notification that the copy was completed or when the
|
| // DXVAPictureBuffer instance is destroyed.
|
| decoder_dx11_texture_ = dx11_texture;
|
| - decoder->CopyTexture(dx11_texture, dx11_decoding_texture_.get(),
|
| + decoder->CopyTexture(dx11_texture, dx11_decoding_texture_.Get(),
|
| dx11_keyed_mutex_, keyed_mutex_value_, id(),
|
| input_buffer_id, color_space_);
|
| return true;
|
| @@ -323,7 +323,7 @@ bool PbufferPictureBuffer::CopyOutputSampleDataToPictureBuffer(
|
|
|
| decoder_surface_ = dest_surface;
|
|
|
| - decoder->CopySurface(decoder_surface_.get(), target_surface_.get(), id(),
|
| + decoder->CopySurface(decoder_surface_.Get(), target_surface_.Get(), id(),
|
| input_buffer_id, color_space_);
|
| color_space_ = gfx::ColorSpace();
|
| return true;
|
| @@ -347,12 +347,12 @@ bool PbufferPictureBuffer::CopySurfaceComplete(
|
| glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
|
| if (src_surface && dest_surface) {
|
| - DCHECK_EQ(src_surface, decoder_surface_.get());
|
| - DCHECK_EQ(dest_surface, target_surface_.get());
|
| + DCHECK_EQ(src_surface, decoder_surface_.Get());
|
| + DCHECK_EQ(dest_surface, target_surface_.Get());
|
| decoder_surface_.Reset();
|
| target_surface_.Reset();
|
| } else {
|
| - DCHECK(decoder_dx11_texture_.get());
|
| + DCHECK(decoder_dx11_texture_.Get());
|
| decoder_dx11_texture_.Reset();
|
| }
|
| if (egl_keyed_mutex_) {
|
| @@ -486,7 +486,7 @@ bool EGLStreamPictureBuffer::BindSampleToTexture(
|
| RETURN_ON_HR_FAILURE(hr, "Failed to get buffer from output sample", false);
|
|
|
| base::win::ScopedComPtr<IMFDXGIBuffer> dxgi_buffer;
|
| - hr = dxgi_buffer.QueryFrom(output_buffer.get());
|
| + hr = dxgi_buffer.QueryFrom(output_buffer.Get());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to get DXGIBuffer from output sample",
|
| false);
|
| hr = dxgi_buffer->GetResource(IID_PPV_ARGS(dx11_decoding_texture_.Receive()));
|
| @@ -499,7 +499,7 @@ bool EGLStreamPictureBuffer::BindSampleToTexture(
|
| };
|
|
|
| EGLBoolean result = eglStreamPostD3DTextureNV12ANGLE(
|
| - egl_display, stream_, static_cast<void*>(dx11_decoding_texture_.get()),
|
| + egl_display, stream_, static_cast<void*>(dx11_decoding_texture_.Get()),
|
| frame_attributes);
|
| RETURN_ON_FAILURE(result, "Could not post texture", false);
|
| result = eglStreamConsumerAcquireKHR(egl_display, stream_);
|
| @@ -588,11 +588,11 @@ bool EGLStreamCopyPictureBuffer::Initialize(
|
| &desc, nullptr, decoder_copy_texture_.Receive());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to create texture", false);
|
| DCHECK(decoder.use_keyed_mutex_);
|
| - hr = dx11_keyed_mutex_.QueryFrom(decoder_copy_texture_.get());
|
| + hr = dx11_keyed_mutex_.QueryFrom(decoder_copy_texture_.Get());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to get keyed mutex", false);
|
|
|
| base::win::ScopedComPtr<IDXGIResource> resource;
|
| - hr = resource.QueryFrom(decoder_copy_texture_.get());
|
| + hr = resource.QueryFrom(decoder_copy_texture_.Get());
|
| DCHECK(SUCCEEDED(hr));
|
| hr = resource->GetSharedHandle(&texture_share_handle_);
|
| RETURN_ON_FAILURE(SUCCEEDED(hr) && texture_share_handle_,
|
| @@ -601,7 +601,7 @@ bool EGLStreamCopyPictureBuffer::Initialize(
|
| hr = decoder.angle_device_->OpenSharedResource(
|
| texture_share_handle_, IID_PPV_ARGS(angle_copy_texture_.Receive()));
|
| RETURN_ON_HR_FAILURE(hr, "Failed to open shared resource", false);
|
| - hr = egl_keyed_mutex_.QueryFrom(angle_copy_texture_.get());
|
| + hr = egl_keyed_mutex_.QueryFrom(angle_copy_texture_.Get());
|
| RETURN_ON_HR_FAILURE(hr, "Failed to get ANGLE mutex", false);
|
| return true;
|
| }
|
| @@ -618,7 +618,7 @@ bool EGLStreamCopyPictureBuffer::CopyOutputSampleDataToPictureBuffer(
|
| // when we receive a notification that the copy was completed or when the
|
| // DXVAPictureBuffer instance is destroyed.
|
| dx11_decoding_texture_ = dx11_texture;
|
| - decoder->CopyTexture(dx11_texture, decoder_copy_texture_.get(),
|
| + decoder->CopyTexture(dx11_texture, decoder_copy_texture_.Get(),
|
| dx11_keyed_mutex_, keyed_mutex_value_, id(),
|
| input_buffer_id, color_space_);
|
| // The texture copy will acquire the current keyed mutex value and release
|
| @@ -648,7 +648,7 @@ bool EGLStreamCopyPictureBuffer::CopySurfaceComplete(
|
| EGLDisplay egl_display = gl::GLSurfaceEGL::GetHardwareDisplay();
|
|
|
| EGLBoolean result = eglStreamPostD3DTextureNV12ANGLE(
|
| - egl_display, stream_, static_cast<void*>(angle_copy_texture_.get()),
|
| + egl_display, stream_, static_cast<void*>(angle_copy_texture_.Get()),
|
| frame_attributes);
|
| RETURN_ON_FAILURE(result, "Could not post stream", false);
|
| result = eglStreamConsumerAcquireKHR(egl_display, stream_);
|
|
|