Separate stubs for V4L2 and VAAPI.

media/gpu/vaapi_wrapper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/gpu/vaapi_wrapper.h"
 
 #include <dlfcn.h>
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
 
 // Auto-generated for dlopen libva libraries
-#include "media/gpu/va_stubs.h"
+#include "media/gpu/vaapi/va_stubs.h"
 
 #include "media/gpu/vaapi_picture.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "ui/gl/gl_bindings.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_types.h"  // nogncheck
 #elif defined(USE_OZONE)
 #include "third_party/libva/va/drm/va_drm.h"
 #include "third_party/libva/va/va_drmcommon.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #endif  // USE_X11
 
-using media_gpu::kModuleVa;
+using media_gpu_vaapi::kModuleVa;
 #if defined(USE_X11)
-using media_gpu::kModuleVa_x11;
+using media_gpu_vaapi::kModuleVa_x11;
 #elif defined(USE_OZONE)
-using media_gpu::kModuleVa_drm;
+using media_gpu_vaapi::kModuleVa_drm;
 #endif  // USE_X11
-using media_gpu::InitializeStubs;
-using media_gpu::StubPathMap;
+using media_gpu_vaapi::InitializeStubs;
+using media_gpu_vaapi::StubPathMap;
 
 #define LOG_VA_ERROR_AND_REPORT(va_error, err_msg)                  \
   do {                                                              \
     LOG(ERROR) << err_msg << " VA error: " << vaErrorStr(va_error); \
     report_error_to_uma_cb_.Run();                                  \
   } while (0)
 
 #define VA_LOG_ON_ERROR(va_error, err_msg)        \
   do {                                            \
     if ((va_error) != VA_STATUS_SUCCESS)          \
@@ skipping 1200 matching lines @@
   drm_fd_.reset(HANDLE_EINTR(dup(fd)));
 }
 #endif  // USE_OZONE
 
 bool VaapiWrapper::VADisplayState::VAAPIVersionLessThan(int major, int minor) {
   return (major_version_ < major) ||
          (major_version_ == major && minor_version_ < minor);
 }
 
 }  // namespace media