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

Side by Side Diff: content/common/gpu/media/vaapi_drm_picture.cc

Issue 1417753007: ui: Revert gfx::BufferUsage::SCANOUT to gfx::BufferUsage::GPU_READ_WRITE change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
OLDNEW
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 "base/file_descriptor_posix.h" 5 #include "base/file_descriptor_posix.h"
6 #include "content/common/gpu/media/va_surface.h" 6 #include "content/common/gpu/media/va_surface.h"
7 #include "content/common/gpu/media/vaapi_drm_picture.h" 7 #include "content/common/gpu/media/vaapi_drm_picture.h"
8 #include "content/common/gpu/media/vaapi_wrapper.h" 8 #include "content/common/gpu/media/vaapi_wrapper.h"
9 #include "third_party/libva/va/drm/va_drm.h" 9 #include "third_party/libva/va/drm/va_drm.h"
10 #include "third_party/libva/va/va.h" 10 #include "third_party/libva/va/va.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 90 }
91 91
92 scoped_refptr<ui::NativePixmap> VaapiDrmPicture::CreateNativePixmap( 92 scoped_refptr<ui::NativePixmap> VaapiDrmPicture::CreateNativePixmap(
93 gfx::Size size) { 93 gfx::Size size) {
94 ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance(); 94 ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance();
95 ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone(); 95 ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone();
96 96
97 // Create a buffer from Ozone. 97 // Create a buffer from Ozone.
98 return factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, size, 98 return factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, size,
99 gfx::BufferFormat::BGRX_8888, 99 gfx::BufferFormat::BGRX_8888,
100 gfx::BufferUsage::GPU_READ_WRITE); 100 gfx::BufferUsage::SCANOUT);
101 } 101 }
102 102
103 bool VaapiDrmPicture::Initialize() { 103 bool VaapiDrmPicture::Initialize() {
104 // We want to create a VASurface and an EGLImage out of the same 104 // We want to create a VASurface and an EGLImage out of the same
105 // memory buffer, so we can output decoded pictures to it using 105 // memory buffer, so we can output decoded pictures to it using
106 // VAAPI and also use it to paint with GL. 106 // VAAPI and also use it to paint with GL.
107 pixmap_ = CreateNativePixmap(size()); 107 pixmap_ = CreateNativePixmap(size());
108 if (!pixmap_) { 108 if (!pixmap_) {
109 LOG(ERROR) << "Failed creating an Ozone NativePixmap"; 109 LOG(ERROR) << "Failed creating an Ozone NativePixmap";
110 return false; 110 return false;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 scoped_refptr<gl::GLImage> VaapiDrmPicture::GetImageToBind() { 192 scoped_refptr<gl::GLImage> VaapiDrmPicture::GetImageToBind() {
193 return gl_image_; 193 return gl_image_;
194 } 194 }
195 195
196 bool VaapiDrmPicture::AllowOverlay() const { 196 bool VaapiDrmPicture::AllowOverlay() const {
197 return true; 197 return true;
198 } 198 }
199 199
200 } // namespace 200 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698