diff options
Diffstat (limited to 'media/capture/video/linux')
9 files changed, 37 insertions, 14 deletions
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc index 595ea38..6e821ff 100644 --- a/media/capture/video/linux/v4l2_capture_delegate.cc +++ b/media/capture/video/linux/v4l2_capture_delegate.cc @@ -13,6 +13,7 @@ #include "base/files/file_enumerator.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/base/bind_to_current_loop.h" #include "media/capture/video/linux/v4l2_capture_delegate_multi_plane.h" #include "media/capture/video/linux/v4l2_capture_delegate_single_plane.h" diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h index c07dccf..7e3dbae 100644 --- a/media/capture/video/linux/v4l2_capture_delegate.h +++ b/media/capture/video/linux/v4l2_capture_delegate.h @@ -5,17 +5,21 @@ #ifndef MEDIA_VIDEO_CAPTURE_LINUX_V4L2_VIDEO_CAPTURE_DELEGATE_H_ #define MEDIA_VIDEO_CAPTURE_LINUX_V4L2_VIDEO_CAPTURE_DELEGATE_H_ -#if defined(OS_OPENBSD) -#include <sys/videoio.h> -#else -#include <linux/videodev2.h> -#endif +#include <stddef.h> +#include <stdint.h> #include "base/files/scoped_file.h" #include "base/macros.h" #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "media/capture/video/video_capture_device.h" +#if defined(OS_OPENBSD) +#include <sys/videoio.h> +#else +#include <linux/videodev2.h> +#endif + namespace tracked_objects { class Location; } // namespace tracked_objects diff --git a/media/capture/video/linux/v4l2_capture_delegate_multi_plane.cc b/media/capture/video/linux/v4l2_capture_delegate_multi_plane.cc index 6aab0de..22e2af9 100644 --- a/media/capture/video/linux/v4l2_capture_delegate_multi_plane.cc +++ b/media/capture/video/linux/v4l2_capture_delegate_multi_plane.cc @@ -4,6 +4,7 @@ #include "media/capture/video/linux/v4l2_capture_delegate_multi_plane.h" +#include <stddef.h> #include <sys/mman.h> namespace media { diff --git a/media/capture/video/linux/v4l2_capture_delegate_multi_plane.h b/media/capture/video/linux/v4l2_capture_delegate_multi_plane.h index ee6cad3..265f6b5 100644 --- a/media/capture/video/linux/v4l2_capture_delegate_multi_plane.h +++ b/media/capture/video/linux/v4l2_capture_delegate_multi_plane.h @@ -5,7 +5,10 @@ #ifndef MEDIA_VIDEO_CAPTURE_LINUX_V4L2_CAPTURE_DELEGATE_MULTI_PLANE_H_ #define MEDIA_VIDEO_CAPTURE_LINUX_V4L2_CAPTURE_DELEGATE_MULTI_PLANE_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "media/capture/video/linux/v4l2_capture_delegate.h" #if defined(OS_OPENBSD) diff --git a/media/capture/video/linux/v4l2_capture_delegate_single_plane.h b/media/capture/video/linux/v4l2_capture_delegate_single_plane.h index 5124f14..9ddb9b6 100644 --- a/media/capture/video/linux/v4l2_capture_delegate_single_plane.h +++ b/media/capture/video/linux/v4l2_capture_delegate_single_plane.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_CAPTURE_LINUX_V4L2_CAPTURE_DELEGATE_SINGLE_PLANE_H_ #define MEDIA_VIDEO_CAPTURE_LINUX_V4L2_CAPTURE_DELEGATE_SINGLE_PLANE_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "media/capture/video/linux/v4l2_capture_delegate.h" #include "media/capture/video/video_capture_device.h" diff --git a/media/capture/video/linux/video_capture_device_chromeos.cc b/media/capture/video/linux/video_capture_device_chromeos.cc index 3f2d761..a8f6e5e 100644 --- a/media/capture/video/linux/video_capture_device_chromeos.cc +++ b/media/capture/video/linux/video_capture_device_chromeos.cc @@ -4,7 +4,10 @@ #include "media/capture/video/linux/video_capture_device_chromeos.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" diff --git a/media/capture/video/linux/video_capture_device_factory_linux.cc b/media/capture/video/linux/video_capture_device_factory_linux.cc index f1d89f8..901b071 100644 --- a/media/capture/video/linux/video_capture_device_factory_linux.cc +++ b/media/capture/video/linux/video_capture_device_factory_linux.cc @@ -6,16 +6,20 @@ #include <errno.h> #include <fcntl.h> +#include <stdint.h> +#include <sys/ioctl.h> + +#include "base/files/file_enumerator.h" +#include "base/files/scoped_file.h" +#include "base/posix/eintr_wrapper.h" +#include "build/build_config.h" + #if defined(OS_OPENBSD) #include <sys/videoio.h> #else #include <linux/videodev2.h> #endif -#include <sys/ioctl.h> -#include "base/files/file_enumerator.h" -#include "base/files/scoped_file.h" -#include "base/posix/eintr_wrapper.h" #if defined(OS_CHROMEOS) #include "media/capture/video/linux/video_capture_device_chromeos.h" #endif diff --git a/media/capture/video/linux/video_capture_device_linux.cc b/media/capture/video/linux/video_capture_device_linux.cc index e6390b5..32f30e0 100644 --- a/media/capture/video/linux/video_capture_device_linux.cc +++ b/media/capture/video/linux/video_capture_device_linux.cc @@ -4,18 +4,21 @@ #include "media/capture/video/linux/video_capture_device_linux.h" -#if defined(OS_OPENBSD) -#include <sys/videoio.h> -#else -#include <linux/videodev2.h> -#endif +#include <stddef.h> #include <list> #include "base/bind.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/capture/video/linux/v4l2_capture_delegate.h" +#if defined(OS_OPENBSD) +#include <sys/videoio.h> +#else +#include <linux/videodev2.h> +#endif + namespace media { // USB VID and PID are both 4 bytes long. diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h index 27e44ae..0f654db 100644 --- a/media/capture/video/linux/video_capture_device_linux.h +++ b/media/capture/video/linux/video_capture_device_linux.h @@ -10,6 +10,8 @@ #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ +#include <stdint.h> + #include <string> #include "base/files/file_util.h" |