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

Unified Diff: content/common/gpu/media/vaapi_picture.cc

Issue 825163004: Add Vaapi support on Ozone/Freon (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix comment in VaapiWrapper Created 6 years 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_picture.cc
diff --git a/content/common/gpu/media/vaapi_picture.cc b/content/common/gpu/media/vaapi_picture.cc
index d02f6d60a59231d996a82a35a492e234f7f23177..782971c61f2113a9854b1676800c942d26e4fd48 100644
--- a/content/common/gpu/media/vaapi_picture.cc
+++ b/content/common/gpu/media/vaapi_picture.cc
@@ -9,6 +9,8 @@
#if defined(USE_X11)
#include "content/common/gpu/media/vaapi_tfp_picture.h"
+#elif defined(USE_OZONE)
+#include "content/common/gpu/media/vaapi_drm_picture.h"
#endif
namespace content {
@@ -24,6 +26,9 @@ linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
#if defined(USE_X11)
picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,
picture_buffer_id, texture_id, size));
+#elif defined(USE_OZONE)
+ picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current,
+ picture_buffer_id, texture_id, size));
#endif // USE_X11
if (picture.get() && !picture->Initialize())
@@ -34,7 +39,11 @@ linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
// static
uint32 VaapiPicture::GetGLTextureTarget() {
+#if defined(USE_OZONE)
+ return GL_TEXTURE_EXTERNAL_OES;
+#else
return GL_TEXTURE_2D;
+#endif
}
} // namespace content
« no previous file with comments | « content/common/gpu/media/vaapi_drm_picture.cc ('k') | content/common/gpu/media/vaapi_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698