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

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

Issue 14844004: gpu: Refactor to support cross-channel shared textures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix accidentally reverted behavior Created 7 years, 7 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 | « no previous file | gpu/command_buffer/service/context_group.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 251e2027a02886ecaf8ac1a6baee9931cf25216b..96d78a527078b56c3605909debea0cd650bc8f11 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -247,12 +247,14 @@ void GpuVideoDecodeAccelerator::OnAssignPictureBuffers(
NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
return;
}
- gpu::gles2::Texture* info = texture_manager->GetTexture(texture_ids[i]);
- if (!info) {
+ gpu::gles2::TextureRef* texture_ref = texture_manager->GetTexture(
+ texture_ids[i]);
+ if (!texture_ref) {
DLOG(FATAL) << "Failed to find texture id " << texture_ids[i];
NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
return;
}
+ gpu::gles2::Texture* info = texture_ref->texture();
if (info->target() != texture_target_) {
DLOG(FATAL) << "Texture target mismatch for texture id "
<< texture_ids[i];
@@ -270,7 +272,7 @@ void GpuVideoDecodeAccelerator::OnAssignPictureBuffers(
return;
}
}
- if (!texture_manager->ClearRenderableLevels(command_decoder, info)) {
+ if (!texture_manager->ClearRenderableLevels(command_decoder, texture_ref)) {
DLOG(FATAL) << "Failed to Clear texture id " << texture_ids[i];
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
return;
« no previous file with comments | « no previous file | gpu/command_buffer/service/context_group.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698