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

Unified Diff: media/gpu/avda_codec_image.h

Issue 2351293003: Relocate SurfaceTexture usage from AVDA GLImage into shared state. (Closed)
Patch Set: Unflip default matrix. Created 4 years, 3 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 | media/gpu/avda_codec_image.cc » ('j') | media/gpu/avda_shared_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/avda_codec_image.h
diff --git a/media/gpu/avda_codec_image.h b/media/gpu/avda_codec_image.h
index 72f706831ac10492a7f6977edb8a5e5fdcc9263a..fd96fa759613e2a4e0decd685e8688c1799f686e 100644
--- a/media/gpu/avda_codec_image.h
+++ b/media/gpu/avda_codec_image.h
@@ -28,8 +28,7 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
AVDACodecImage(int picture_buffer_id,
const scoped_refptr<AVDASharedState>& shared_state,
VideoCodecBridge* codec,
- const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder,
- const scoped_refptr<gl::SurfaceTexture>& surface_texture);
+ const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder);
// gl::GLImage implementation
void Destroy(bool have_context) override;
@@ -144,16 +143,12 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_;
- // The SurfaceTexture to render to. This is null when rendering to a
- // SurfaceView.
- const scoped_refptr<gl::SurfaceTexture> surface_texture_;
+ // Indicates if we're rendering to a SurfaceTexture or not.
+ const bool has_surface_texture_;
// The texture that we're attached to.
gpu::gles2::Texture* texture_;
- // Texture matrix of the front buffer of the surface texture.
- float gl_matrix_[16];
-
// The picture buffer id attached to this image.
int picture_buffer_id_;
« no previous file with comments | « no previous file | media/gpu/avda_codec_image.cc » ('j') | media/gpu/avda_shared_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698