summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2016-03-22 23:11:51 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 06:13:40 +0000
commit24da601d444c8822c5ff0a10751b9384f25dd1b4 (patch)
tree4bab5e62bd0879c06991d58e5adefa4fb65c4607 /media
parent45cf0b58103c62895d4e4c8223e798bf84a42345 (diff)
downloadchromium_src-24da601d444c8822c5ff0a10751b9384f25dd1b4.zip
chromium_src-24da601d444c8822c5ff0a10751b9384f25dd1b4.tar.gz
chromium_src-24da601d444c8822c5ff0a10751b9384f25dd1b4.tar.bz2
Mac: Decode hardware to 420 instead of 422
If the decoded frame is going to be used as a CALayer overlay, then it will never be converted to RGBA. If it is used by OpenGL, then the same infrastructure for software frames will be employed to make an expensive RGBA copy of the frame. BUG=594452 Review URL: https://codereview.chromium.org/1822173002 Cr-Commit-Position: refs/heads/master@{#382797}
Diffstat (limited to 'media')
-rw-r--r--media/video/video_decode_accelerator.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
index ad73432..a840750 100644
--- a/media/video/video_decode_accelerator.h
+++ b/media/video/video_decode_accelerator.h
@@ -15,6 +15,7 @@
#include "media/base/video_decoder_config.h"
#include "media/video/picture.h"
#include "ui/gfx/geometry/size.h"
+#include "ui/gl/gl_image.h"
typedef unsigned int GLenum;
@@ -37,6 +38,10 @@ class MEDIA_EXPORT VideoDecodeAccelerator {
};
using SupportedProfiles = std::vector<SupportedProfile>;
+ using MakeContextCurrentCallback = base::Callback<bool(void)>;
+ using BindImageCallback = base::Callback<
+ void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>, bool)>;
+
struct MEDIA_EXPORT Capabilities {
Capabilities();
Capabilities(const Capabilities& other);