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

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

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 if (!vpp_result) { 184 if (!vpp_result) {
185 LOG(ERROR) << "Failed scaling NativePixmap"; 185 LOG(ERROR) << "Failed scaling NativePixmap";
186 scaled_pixmap_ = nullptr; 186 scaled_pixmap_ = nullptr;
187 scaled_va_surface_ = nullptr; 187 scaled_va_surface_ = nullptr;
188 return nullptr; 188 return nullptr;
189 } 189 }
190 190
191 return scaled_pixmap_; 191 return scaled_pixmap_;
192 } 192 }
193 193
194 scoped_refptr<gfx::GLImage> VaapiDrmPicture::GetImageToBind() { 194 scoped_refptr<gl::GLImage> VaapiDrmPicture::GetImageToBind() {
195 return gl_image_; 195 return gl_image_;
196 } 196 }
197 197
198 bool VaapiDrmPicture::AllowOverlay() const { 198 bool VaapiDrmPicture::AllowOverlay() const {
199 return true; 199 return true;
200 } 200 }
201 201
202 } // namespace 202 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698