OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // This file contains an implementation of picture allocation for the | 5 // This file contains an implementation of picture allocation for the |
6 // Ozone window system used by VaapiVideoDecodeAccelerator to produce | 6 // Ozone window system used by VaapiVideoDecodeAccelerator to produce |
7 // output pictures. | 7 // output pictures. |
8 | 8 |
9 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ | 9 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ |
10 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ | 10 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ |
11 | 11 |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "content/common/gpu/media/vaapi_picture.h" | 14 #include "content/common/gpu/media/vaapi_picture.h" |
15 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
16 | 16 |
17 namespace gfx { | 17 namespace gfx { |
18 class GLImageLinuxDMABuffer; | 18 class GLImage; |
19 } | 19 } |
20 | 20 |
21 namespace ui { | 21 namespace ui { |
22 class NativePixmap; | 22 class NativePixmap; |
23 } | 23 } |
24 | 24 |
25 namespace content { | 25 namespace content { |
26 | 26 |
27 class VaapiWrapper; | 27 class VaapiWrapper; |
28 | 28 |
29 // Implementation of VaapiPicture for the ozone/drm backed chromium. | 29 // Implementation of VaapiPicture for the ozone/drm backed chromium. |
30 class VaapiDrmPicture : public VaapiPicture { | 30 class VaapiDrmPicture : public VaapiPicture { |
31 public: | 31 public: |
32 VaapiDrmPicture(VaapiWrapper* vaapi_wrapper, | 32 VaapiDrmPicture(VaapiWrapper* vaapi_wrapper, |
33 const base::Callback<bool(void)>& make_context_current, | 33 const base::Callback<bool(void)>& make_context_current, |
34 int32 picture_buffer_id, | 34 int32 picture_buffer_id, |
35 uint32 texture_id, | 35 uint32 texture_id, |
36 const gfx::Size& size); | 36 const gfx::Size& size); |
37 | 37 |
38 ~VaapiDrmPicture() override; | 38 ~VaapiDrmPicture() override; |
39 | 39 |
40 bool Initialize() override; | 40 bool Initialize(gpu::gles2::TextureManager* texture_manager, |
41 gpu::gles2::TextureRef* texture_ref) override; | |
41 | 42 |
42 bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override; | 43 bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override; |
43 | 44 |
44 private: | 45 private: |
45 VaapiWrapper* vaapi_wrapper_; // Not owned. | 46 VaapiWrapper* vaapi_wrapper_; // Not owned. |
46 base::Callback<bool(void)> make_context_current_; | 47 base::Callback<bool(void)> make_context_current_; |
47 | 48 |
48 // Ozone buffer, the storage of the EGLImage and the VASurface. | 49 // Ozone buffer, the storage of the EGLImage and the VASurface. |
49 scoped_refptr<ui::NativePixmap> pixmap_; | 50 scoped_refptr<ui::NativePixmap> pixmap_; |
50 | 51 |
51 // EGLImage bound to the GL textures used by the VDA client. | 52 // EGLImage bound to the GL textures used by the VDA client. |
Pawel Osciak
2015/01/21 13:07:08
Please update documentation.
achaulk
2015/01/21 17:10:03
This is still right, it is still an EGLImage, just
| |
52 scoped_refptr<gfx::GLImageLinuxDMABuffer> gl_image_; | 53 scoped_refptr<gfx::GLImage> gl_image_; |
53 | 54 |
54 // VASurface used to transfer from the decoder's pixel format. | 55 // VASurface used to transfer from the decoder's pixel format. |
55 scoped_refptr<VASurface> va_surface_; | 56 scoped_refptr<VASurface> va_surface_; |
56 | 57 |
57 DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture); | 58 DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture); |
58 }; | 59 }; |
59 | 60 |
60 } // namespace content | 61 } // namespace content |
61 | 62 |
62 #endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ | 63 #endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_ |
OLD | NEW |