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 #include "content/common/gpu/media/avda_codec_image.h" | 5 #include "media/gpu/avda_codec_image.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
10 #include "content/common/gpu/media/avda_shared_state.h" | |
11 #include "gpu/command_buffer/service/context_group.h" | 10 #include "gpu/command_buffer/service/context_group.h" |
12 #include "gpu/command_buffer/service/context_state.h" | 11 #include "gpu/command_buffer/service/context_state.h" |
13 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 12 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
14 #include "gpu/command_buffer/service/texture_manager.h" | 13 #include "gpu/command_buffer/service/texture_manager.h" |
| 14 #include "media/gpu/avda_shared_state.h" |
15 #include "ui/gl/android/surface_texture.h" | 15 #include "ui/gl/android/surface_texture.h" |
16 #include "ui/gl/gl_context.h" | 16 #include "ui/gl/gl_context.h" |
17 #include "ui/gl/scoped_make_current.h" | 17 #include "ui/gl/scoped_make_current.h" |
18 | 18 |
19 namespace content { | 19 namespace media { |
20 | 20 |
21 AVDACodecImage::AVDACodecImage( | 21 AVDACodecImage::AVDACodecImage( |
22 const scoped_refptr<AVDASharedState>& shared_state, | 22 const scoped_refptr<AVDASharedState>& shared_state, |
23 media::VideoCodecBridge* codec, | 23 media::VideoCodecBridge* codec, |
24 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder, | 24 const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder, |
25 const scoped_refptr<gfx::SurfaceTexture>& surface_texture) | 25 const scoped_refptr<gfx::SurfaceTexture>& surface_texture) |
26 : shared_state_(shared_state), | 26 : shared_state_(shared_state), |
27 codec_buffer_index_(kInvalidCodecBufferIndex), | 27 codec_buffer_index_(kInvalidCodecBufferIndex), |
28 media_codec_(codec), | 28 media_codec_(codec), |
29 decoder_(decoder), | 29 decoder_(decoder), |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 } | 231 } |
232 } | 232 } |
233 | 233 |
234 memcpy(matrix, gl_matrix_, sizeof(gl_matrix_)); | 234 memcpy(matrix, gl_matrix_, sizeof(gl_matrix_)); |
235 } | 235 } |
236 | 236 |
237 bool AVDACodecImage::IsCodecBufferOutstanding() const { | 237 bool AVDACodecImage::IsCodecBufferOutstanding() const { |
238 return codec_buffer_index_ != kInvalidCodecBufferIndex && media_codec_; | 238 return codec_buffer_index_ != kInvalidCodecBufferIndex && media_codec_; |
239 } | 239 } |
240 | 240 |
241 } // namespace content | 241 } // namespace media |
OLD | NEW |