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

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

Issue 1422563002: [Ozone] Enables overlay render format setting path and by default use UYVY (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_wrapper.cc
diff --git a/content/common/gpu/media/vaapi_wrapper.cc b/content/common/gpu/media/vaapi_wrapper.cc
index 4f073d3a1768ba2cba239e58cd7a7627e8b95b3c..c74a11123d24bdd62cc5ea93dc1f57d58e1d0c8f 100644
--- a/content/common/gpu/media/vaapi_wrapper.cc
+++ b/content/common/gpu/media/vaapi_wrapper.cc
@@ -114,8 +114,12 @@ static std::vector<VAConfigAttrib> GetRequiredAttribs(
VASurface::VASurface(VASurfaceID va_surface_id,
const gfx::Size& size,
+ const unsigned int format,
const ReleaseCB& release_cb)
- : va_surface_id_(va_surface_id), size_(size), release_cb_(release_cb) {
+ : va_surface_id_(va_surface_id),
+ size_(size),
+ format_(format),
+ release_cb_(release_cb) {
DCHECK(!release_cb_.is_null());
}
@@ -124,7 +128,8 @@ VASurface::~VASurface() {
}
VaapiWrapper::VaapiWrapper()
- : va_display_(NULL),
+ : va_surface_format_(0),
+ va_display_(NULL),
va_config_id_(VA_INVALID_ID),
va_context_id_(VA_INVALID_ID),
va_vpp_config_id_(VA_INVALID_ID),
@@ -511,6 +516,7 @@ bool VaapiWrapper::CreateSurfaces(unsigned int va_format,
DCHECK(va_surfaces->empty());
DCHECK(va_surface_ids_.empty());
+ DCHECK_EQ(va_surface_format_, 0u);
va_surface_ids_.resize(num_surfaces);
// Allocate surfaces in driver.
@@ -537,6 +543,7 @@ bool VaapiWrapper::CreateSurfaces(unsigned int va_format,
}
*va_surfaces = va_surface_ids_;
+ va_surface_format_ = va_format;
return true;
}
@@ -579,7 +586,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateUnownedSurface(
// of the destruction order. All the surfaces will be destroyed
// before VaapiWrapper.
va_surface = new VASurface(
- va_surface_id, size,
+ va_surface_id, size, va_format,
base::Bind(&VaapiWrapper::DestroyUnownedSurface, base::Unretained(this)));
return va_surface;

Powered by Google App Engine
This is Rietveld 408576698