OLD | NEW |
---|---|
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 MEDIA_GPU_AVDA_CODEC_IMAGE_H_ | 5 #ifndef MEDIA_GPU_AVDA_CODEC_IMAGE_H_ |
6 #define MEDIA_GPU_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 "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" | 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 media { | 20 namespace media { |
21 | 21 |
22 class VideoCodecBridge; | |
liberato (no reviews please)
2016/06/06 21:35:54
was this because of the include change in shared_s
watk
2016/06/07 02:22:10
Must have been :\ I just did what I had to in orde
| |
23 | |
22 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as | 24 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as |
23 // needed in order to draw them. | 25 // needed in order to draw them. |
24 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { | 26 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { |
25 public: | 27 public: |
26 AVDACodecImage(int picture_buffer_id, | 28 AVDACodecImage(int picture_buffer_id, |
27 const scoped_refptr<AVDASharedState>& shared_state, | 29 const scoped_refptr<AVDASharedState>& shared_state, |
28 media::VideoCodecBridge* codec, | 30 media::VideoCodecBridge* codec, |
29 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder, | 31 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder, |
30 const scoped_refptr<gl::SurfaceTexture>& surface_texture); | 32 const scoped_refptr<gl::SurfaceTexture>& surface_texture); |
31 | 33 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 | 155 |
154 // The picture buffer id attached to this image. | 156 // The picture buffer id attached to this image. |
155 int picture_buffer_id_; | 157 int picture_buffer_id_; |
156 | 158 |
157 DISALLOW_COPY_AND_ASSIGN(AVDACodecImage); | 159 DISALLOW_COPY_AND_ASSIGN(AVDACodecImage); |
158 }; | 160 }; |
159 | 161 |
160 } // namespace media | 162 } // namespace media |
161 | 163 |
162 #endif // MEDIA_GPU_AVDA_CODEC_IMAGE_H_ | 164 #endif // MEDIA_GPU_AVDA_CODEC_IMAGE_H_ |
OLD | NEW |