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 #include "content/common/gpu/media/va_surface.h" | 5 #include "content/common/gpu/media/va_surface.h" |
6 #include "content/common/gpu/media/vaapi_tfp_picture.h" | 6 #include "content/common/gpu/media/vaapi_tfp_picture.h" |
7 #include "content/common/gpu/media/vaapi_wrapper.h" | 7 #include "content/common/gpu/media/vaapi_wrapper.h" |
8 #include "ui/gfx/x/x11_types.h" | 8 #include "ui/gfx/x/x11_types.h" |
9 #include "ui/gl/gl_bindings.h" | 9 #include "ui/gl/gl_bindings.h" |
10 #include "ui/gl/gl_image_glx.h" | 10 #include "ui/gl/gl_image_glx.h" |
11 #include "ui/gl/scoped_binders.h" | 11 #include "ui/gl/scoped_binders.h" |
12 | 12 |
13 namespace content { | 13 namespace content { |
14 | 14 |
15 VaapiTFPPicture::VaapiTFPPicture( | 15 VaapiTFPPicture::VaapiTFPPicture( |
16 VaapiWrapper* vaapi_wrapper, | 16 VaapiWrapper* vaapi_wrapper, |
17 const base::Callback<bool(void)> make_context_current, | 17 const base::Callback<bool(void)> make_context_current, |
18 int32 picture_buffer_id, | 18 int32 picture_buffer_id, |
19 uint32 texture_id, | 19 uint32 texture_id, |
20 const gfx::Size& size) | 20 const gfx::Size& size) |
21 : VaapiPicture(picture_buffer_id, texture_id, size), | 21 : VaapiPicture(picture_buffer_id, texture_id, size, false), |
22 vaapi_wrapper_(vaapi_wrapper), | 22 vaapi_wrapper_(vaapi_wrapper), |
23 make_context_current_(make_context_current), | 23 make_context_current_(make_context_current), |
24 x_display_(gfx::GetXDisplay()), | 24 x_display_(gfx::GetXDisplay()), |
25 x_pixmap_(0) { | 25 x_pixmap_(0) { |
26 } | 26 } |
27 | 27 |
28 VaapiTFPPicture::~VaapiTFPPicture() { | 28 VaapiTFPPicture::~VaapiTFPPicture() { |
29 if (glx_image_.get() && make_context_current_.Run()) { | 29 if (glx_image_.get() && make_context_current_.Run()) { |
30 glx_image_->ReleaseTexImage(GL_TEXTURE_2D); | 30 glx_image_->ReleaseTexImage(GL_TEXTURE_2D); |
31 glx_image_->Destroy(true); | 31 glx_image_->Destroy(true); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 | 67 |
68 return true; | 68 return true; |
69 } | 69 } |
70 | 70 |
71 bool VaapiTFPPicture::DownloadFromSurface( | 71 bool VaapiTFPPicture::DownloadFromSurface( |
72 const scoped_refptr<VASurface>& va_surface) { | 72 const scoped_refptr<VASurface>& va_surface) { |
73 return vaapi_wrapper_->PutSurfaceIntoPixmap(va_surface->id(), x_pixmap_, | 73 return vaapi_wrapper_->PutSurfaceIntoPixmap(va_surface->id(), x_pixmap_, |
74 va_surface->size()); | 74 va_surface->size()); |
75 } | 75 } |
76 | 76 |
| 77 scoped_refptr<gfx::GLImage> VaapiTFPPicture::GetImageToBind() { |
| 78 return nullptr; |
| 79 } |
| 80 |
77 } // namespace content | 81 } // namespace content |
OLD | NEW |