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

Unified Diff: media/gpu/dxva_picture_buffer_win.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/gpu/avda_picture_buffer_manager.cc ('k') | media/gpu/dxva_video_decode_accelerator_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2a688a16a83531e9551dbae9d91212d4e611dcd8..9518b5b75bbe42cdbcaae2c303545b3cd62e6d94 100644
--- a/media/gpu/dxva_picture_buffer_win.cc
+++ b/media/gpu/dxva_picture_buffer_win.cc
@@ -274,7 +274,7 @@ bool PbufferPictureBuffer::CopySurfaceComplete(
GLint current_texture = 0;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &current_texture);
- glBindTexture(GL_TEXTURE_2D, picture_buffer_.texture_ids()[0]);
+ glBindTexture(GL_TEXTURE_2D, picture_buffer_.service_texture_ids()[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -360,11 +360,11 @@ bool EGLStreamPictureBuffer::Initialize() {
stream_ = eglCreateStreamKHR(egl_display, stream_attributes);
RETURN_ON_FAILURE(!!stream_, "Could not create stream", false);
gl::ScopedActiveTexture texture0(GL_TEXTURE0);
- gl::ScopedTextureBinder texture0_binder(GL_TEXTURE_EXTERNAL_OES,
- picture_buffer_.texture_ids()[0]);
+ gl::ScopedTextureBinder texture0_binder(
+ GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[0]);
gl::ScopedActiveTexture texture1(GL_TEXTURE1);
- gl::ScopedTextureBinder texture1_binder(GL_TEXTURE_EXTERNAL_OES,
- picture_buffer_.texture_ids()[1]);
+ gl::ScopedTextureBinder texture1_binder(
+ GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[1]);
EGLAttrib consumer_attributes[] = {
EGL_COLOR_BUFFER_TYPE,
@@ -467,11 +467,11 @@ bool EGLStreamCopyPictureBuffer::Initialize(
stream_ = eglCreateStreamKHR(egl_display, stream_attributes);
RETURN_ON_FAILURE(!!stream_, "Could not create stream", false);
gl::ScopedActiveTexture texture0(GL_TEXTURE0);
- gl::ScopedTextureBinder texture0_binder(GL_TEXTURE_EXTERNAL_OES,
- picture_buffer_.texture_ids()[0]);
+ gl::ScopedTextureBinder texture0_binder(
+ GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[0]);
gl::ScopedActiveTexture texture1(GL_TEXTURE1);
- gl::ScopedTextureBinder texture1_binder(GL_TEXTURE_EXTERNAL_OES,
- picture_buffer_.texture_ids()[1]);
+ gl::ScopedTextureBinder texture1_binder(
+ GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[1]);
EGLAttrib consumer_attributes[] = {
EGL_COLOR_BUFFER_TYPE,
« no previous file with comments | « media/gpu/avda_picture_buffer_manager.cc ('k') | media/gpu/dxva_video_decode_accelerator_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698