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

Unified Diff: content/common/gpu/media/vaapi_video_decode_accelerator.h

Issue 858653002: vaapi plumbing to allow hardware video overlays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc plumbing going in first, so put the link back in Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
index 206999a1db4a3af3ea91bfb74818ef0b1f95f356..e99f04011699d7fc0f706d4ea0b5e945e8488ce8 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -28,6 +28,10 @@
#include "media/video/picture.h"
#include "media/video/video_decode_accelerator.h"
+namespace gfx {
+class GLImage;
+}
+
namespace content {
class VaapiPicture;
@@ -44,7 +48,9 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
: public media::VideoDecodeAccelerator {
public:
VaapiVideoDecodeAccelerator(
- const base::Callback<bool(void)>& make_context_current);
+ const base::Callback<bool(void)>& make_context_current,
+ const base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)>&
+ bind_image);
Pawel Osciak 2015/01/24 00:58:54 Is this a correct indentation?
achaulk 2015/01/27 18:36:48 That's what git cl format produces
virtual ~VaapiVideoDecodeAccelerator();
// media::VideoDecodeAccelerator implementation.
@@ -264,6 +270,8 @@ private:
size_t requested_num_pics_;
gfx::Size requested_pic_size_;
+ base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)> bind_image_;
Pawel Osciak 2015/01/24 00:58:54 Please document.
achaulk 2015/01/27 18:36:48 Done.
Pawel Osciak 2015/01/28 23:52:02 Sorry, where is that documentation?
+
// The WeakPtrFactory for |weak_this_|.
base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;

Powered by Google App Engine
This is Rietveld 408576698