content/common/gpu/media/gpu_video_decode_accelerator.cc - Issue 1401423003: Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1401423003: Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/common/gpu/media/gpu_video_decode_accelerator.cc

diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc

index 52054046105d2c349d34bc92b00f5a2d933e393e..7945ce03e2eacbb4294f0567bddefb9e9ed0e65e 100644

--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc

+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc

@@ -340,8 +340,10 @@ void GpuVideoDecodeAccelerator::BindImage(uint32 client_texture_id,

gpu::gles2::TextureManager* texture_manager =

command_decoder->GetContextGroup()->texture_manager();

gpu::gles2::TextureRef* ref = texture_manager->GetTexture(client_texture_id);

- if (ref)

- texture_manager->SetLevelImage(ref, texture_target, 0, image.get());

+ if (ref) {

+ texture_manager->SetLevelImage(ref, texture_target, 0, image.get(),

+ gpu::gles2::Texture::BOUND);

+ }

}

scoped_ptr<media::VideoDecodeAccelerator>

« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')