Separate stubs for V4L2 and VAAPI.

media/gpu/generic_v4l2_device.cc

 // Copyright 2014 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/generic_v4l2_device.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <libdrm/drm_fourcc.h>
@@ skipping 12 matching lines @@
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "media/gpu/generic_v4l2_device.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_bindings.h"
 
 #if defined(USE_LIBV4L2)
 // Auto-generated for dlopen libv4l2 libraries
-#include "media/gpu/v4l2_stubs.h"
+#include "media/gpu/v4l2/v4l2_stubs.h"
 #include "third_party/v4l-utils/lib/include/libv4l2.h"
 
-using media_gpu::kModuleV4l2;
-using media_gpu::InitializeStubs;
-using media_gpu::StubPathMap;
+using media_gpu_v4l2::kModuleV4l2;
+using media_gpu_v4l2::InitializeStubs;
+using media_gpu_v4l2::StubPathMap;
 
 static const base::FilePath::CharType kV4l2Lib[] =
     FILE_PATH_LITERAL("/usr/lib/libv4l2.so");
 #endif
 
 namespace media {
 
 GenericV4L2Device::GenericV4L2Device() {
 #if defined(USE_LIBV4L2)
   use_libv4l2_ = false;
@@ skipping 437 matching lines @@
   for (const auto& device : devices) {
     if (std::find(device.second.begin(), device.second.end(), pixfmt) !=
         device.second.end())
       return device.first;
   }
 
   return std::string();
 }
 
 }  //  namespace media