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

Side by Side Diff: media/gpu/vaapi_wrapper.cc

Issue 1997083003: media: Fix gn deps on some media/ targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 months 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
« no previous file with comments | « media/gpu/rendering_helper.cc ('k') | media/mojo/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/gpu/vaapi_wrapper.h" 5 #include "media/gpu/vaapi_wrapper.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/numerics/safe_conversions.h" 14 #include "base/numerics/safe_conversions.h"
15 #include "base/sys_info.h" 15 #include "base/sys_info.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 17
18 // Auto-generated for dlopen libva libraries 18 // Auto-generated for dlopen libva libraries
19 #include "media/gpu/va_stubs.h" 19 #include "media/gpu/va_stubs.h"
20 20
21 #include "media/gpu/vaapi_picture.h" 21 #include "media/gpu/vaapi_picture.h"
22 #include "third_party/libyuv/include/libyuv.h" 22 #include "third_party/libyuv/include/libyuv.h"
23 #include "ui/gl/gl_bindings.h" 23 #include "ui/gl/gl_bindings.h"
24 24
25 #if defined(USE_X11) 25 #if defined(USE_X11)
26 #include "ui/gfx/x/x11_types.h" 26 #include "ui/gfx/x/x11_types.h" // nogncheck
27 #elif defined(USE_OZONE) 27 #elif defined(USE_OZONE)
28 #include "third_party/libva/va/drm/va_drm.h" 28 #include "third_party/libva/va/drm/va_drm.h"
29 #include "third_party/libva/va/va_drmcommon.h" 29 #include "third_party/libva/va/va_drmcommon.h"
30 #include "ui/ozone/public/ozone_platform.h" 30 #include "ui/ozone/public/ozone_platform.h"
31 #include "ui/ozone/public/surface_factory_ozone.h" 31 #include "ui/ozone/public/surface_factory_ozone.h"
32 #endif // USE_X11 32 #endif // USE_X11
33 33
34 using media_gpu::kModuleVa; 34 using media_gpu::kModuleVa;
35 #if defined(USE_X11) 35 #if defined(USE_X11)
36 using media_gpu::kModuleVa_x11; 36 using media_gpu::kModuleVa_x11;
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 drm_fd_.reset(HANDLE_EINTR(dup(fd))); 1241 drm_fd_.reset(HANDLE_EINTR(dup(fd)));
1242 } 1242 }
1243 #endif // USE_OZONE 1243 #endif // USE_OZONE
1244 1244
1245 bool VaapiWrapper::VADisplayState::VAAPIVersionLessThan(int major, int minor) { 1245 bool VaapiWrapper::VADisplayState::VAAPIVersionLessThan(int major, int minor) {
1246 return (major_version_ < major) || 1246 return (major_version_ < major) ||
1247 (major_version_ == major && minor_version_ < minor); 1247 (major_version_ == major && minor_version_ < minor);
1248 } 1248 }
1249 1249
1250 } // namespace media 1250 } // namespace media
OLDNEW
« no previous file with comments | « media/gpu/rendering_helper.cc ('k') | media/mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698