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

Unified Diff: media/gpu/avda_picture_buffer_manager.cc

Issue 2382113002: Use clearer names for the PictureBuffer texture id members (Closed)
Patch Set: Added comments Created 4 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
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/gpu/dxva_picture_buffer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/avda_picture_buffer_manager.cc
diff --git a/media/gpu/avda_picture_buffer_manager.cc b/media/gpu/avda_picture_buffer_manager.cc
index 50a23b4776891746ae871ae986a2c3f103940346..0f78a506d69340c4f0653f87381153f668fe9adc 100644
--- a/media/gpu/avda_picture_buffer_manager.cc
+++ b/media/gpu/avda_picture_buffer_manager.cc
@@ -210,9 +210,9 @@ gpu::gles2::TextureRef* AVDAPictureBufferManager::GetTextureForPicture(
gles_decoder->GetContextGroup()->texture_manager();
RETURN_NULL_IF_NULL(texture_manager);
- DCHECK_LE(1u, picture_buffer.internal_texture_ids().size());
+ DCHECK_LE(1u, picture_buffer.client_texture_ids().size());
gpu::gles2::TextureRef* texture_ref =
- texture_manager->GetTexture(picture_buffer.internal_texture_ids()[0]);
+ texture_manager->GetTexture(picture_buffer.client_texture_ids()[0]);
RETURN_NULL_IF_NULL(texture_ref);
return texture_ref;
@@ -305,8 +305,8 @@ void AVDAPictureBufferManager::AssignOnePictureBuffer(
// unless we make the texture transparent.
static const uint8_t rgba[] = {0, 0, 0, 0};
const gfx::Size size(1, 1);
- DCHECK_LE(1u, picture_buffer.texture_ids().size());
- glBindTexture(GL_TEXTURE_2D, picture_buffer.texture_ids()[0]);
+ DCHECK_LE(1u, picture_buffer.service_texture_ids().size());
+ glBindTexture(GL_TEXTURE_2D, picture_buffer.service_texture_ids()[0]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size.width(), size.height(), 0,
GL_RGBA, GL_UNSIGNED_BYTE, rgba);
}
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/gpu/dxva_picture_buffer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698