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

Side by Side Diff: media/gpu/avda_codec_image.h

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « media/gpu/args.gni ('k') | media/gpu/avda_codec_image.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_ 5 #ifndef MEDIA_GPU_AVDA_CODEC_IMAGE_H_
6 #define CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_ 6 #define MEDIA_GPU_AVDA_CODEC_IMAGE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "content/common/gpu/media/avda_shared_state.h"
14 #include "gpu/command_buffer/service/gl_stream_texture_image.h" 13 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
14 #include "media/gpu/avda_shared_state.h"
15 15
16 namespace ui { 16 namespace ui {
17 class ScopedMakeCurrent; 17 class ScopedMakeCurrent;
18 } 18 }
19 19
20 namespace content { 20 namespace media {
21 21
22 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as 22 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as
23 // needed in order to draw them. 23 // needed in order to draw them.
24 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { 24 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
25 public: 25 public:
26 AVDACodecImage(int picture_buffer_id, 26 AVDACodecImage(int picture_buffer_id,
27 const scoped_refptr<AVDASharedState>& shared_state, 27 const scoped_refptr<AVDASharedState>& shared_state,
28 media::VideoCodecBridge* codec, 28 media::VideoCodecBridge* codec,
29 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder, 29 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder,
30 const scoped_refptr<gfx::SurfaceTexture>& surface_texture); 30 const scoped_refptr<gfx::SurfaceTexture>& surface_texture);
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 // Texture matrix of the front buffer of the surface texture. 159 // Texture matrix of the front buffer of the surface texture.
160 float gl_matrix_[16]; 160 float gl_matrix_[16];
161 161
162 // The picture buffer id attached to this image. 162 // The picture buffer id attached to this image.
163 int picture_buffer_id_; 163 int picture_buffer_id_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(AVDACodecImage); 165 DISALLOW_COPY_AND_ASSIGN(AVDACodecImage);
166 }; 166 };
167 167
168 } // namespace content 168 } // namespace media
169 169
170 #endif // CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_ 170 #endif // MEDIA_GPU_AVDA_CODEC_IMAGE_H_
OLDNEW
« no previous file with comments | « media/gpu/args.gni ('k') | media/gpu/avda_codec_image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698