Commit 1356f510 authored by Gil Dekel's avatar Gil Dekel Committed by Commit Bot

media/gpu: Fix #include <va/va.h> position across media/gpu

This CL fixes all #include <va/va.h> orderings across the media/gpu
folder to satisfy the style guide [1] and Tricium.

[1] https://git.io/fjDCc

Bug: None
Test: jpeg_decode_accelerator_unittest && chrome compiles
Change-Id: I3ccdf63db155b61ec5c7091c78e75ea91b3ae897
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715409
Commit-Queue: Gil Dekel <gildekel@chromium.org>
Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680196}
parent 0e89d2c0
...@@ -7,11 +7,10 @@ ...@@ -7,11 +7,10 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <va/va.h>
#include <string> #include <string>
#include <va/va.h>
// This has to be included first. // This has to be included first.
// See http://code.google.com/p/googletest/issues/detail?id=371 // See http://code.google.com/p/googletest/issues/detail?id=371
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
#include "media/gpu/vaapi/vaapi_jpeg_decode_accelerator_worker.h" #include "media/gpu/vaapi/vaapi_jpeg_decode_accelerator_worker.h"
#include <utility>
#include <va/va.h> #include <va/va.h>
#include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/containers/span.h" #include "base/containers/span.h"
#include "base/location.h" #include "base/location.h"
......
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
#include "media/gpu/vaapi/vaapi_jpeg_decoder.h" #include "media/gpu/vaapi/vaapi_jpeg_decoder.h"
#include <string.h> #include <string.h>
#include <va/va.h>
#include <iostream> #include <iostream>
#include <type_traits> #include <type_traits>
#include <va/va.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/stl_util.h" #include "base/stl_util.h"
......
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <va/va.h>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <va/va.h>
// This has to be included first. // This has to be included first.
// See http://code.google.com/p/googletest/issues/detail?id=371 // See http://code.google.com/p/googletest/issues/detail?id=371
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
#include "media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h" #include "media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h"
#include <stddef.h> #include <stddef.h>
#include <va/va.h>
#include <utility> #include <utility>
#include <va/va.h>
#include "base/bind.h" #include "base/bind.h"
#include "base/containers/span.h" #include "base/containers/span.h"
#include "base/location.h" #include "base/location.h"
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
#include "media/gpu/vaapi/vaapi_utils.h" #include "media/gpu/vaapi/vaapi_utils.h"
#include <va/va.h>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <va/va.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/numerics/ranges.h" #include "base/numerics/ranges.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include <va/va.h>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <va/va.h>
// This has to be included first. // This has to be included first.
// See http://code.google.com/p/googletest/issues/detail?id=371 // See http://code.google.com/p/googletest/issues/detail?id=371
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
#include "media/gpu/vaapi/vaapi_video_decode_accelerator.h" #include "media/gpu/vaapi/vaapi_video_decode_accelerator.h"
#include <string.h> #include <string.h>
#include <va/va.h>
#include <memory> #include <memory>
#include <va/va.h>
#include "base/bind.h" #include "base/bind.h"
#include "base/cpu.h" #include "base/cpu.h"
#include "base/files/scoped_file.h" #include "base/files/scoped_file.h"
......
...@@ -5,16 +5,15 @@ ...@@ -5,16 +5,15 @@
#include "media/gpu/vaapi/vaapi_video_encode_accelerator.h" #include "media/gpu/vaapi/vaapi_video_encode_accelerator.h"
#include <string.h> #include <string.h>
#include <va/va.h>
#include <va/va_enc_h264.h>
#include <va/va_enc_vp8.h>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <va/va.h>
#include <va/va_enc_h264.h>
#include <va/va_enc_vp8.h>
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/callback.h" #include "base/callback.h"
......
...@@ -4,12 +4,11 @@ ...@@ -4,12 +4,11 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <va/va.h>
#include <memory> #include <memory>
#include <string> #include <string>
#include <va/va.h>
// This has to be included first. // This has to be included first.
// See http://code.google.com/p/googletest/issues/detail?id=371 // See http://code.google.com/p/googletest/issues/detail?id=371
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -7,16 +7,15 @@ ...@@ -7,16 +7,15 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <algorithm>
#include <type_traits>
#include <utility>
#include <va/va.h> #include <va/va.h>
#include <va/va_drm.h> #include <va/va_drm.h>
#include <va/va_drmcommon.h> #include <va/va_drmcommon.h>
#include <va/va_version.h> #include <va/va_version.h>
#include <algorithm>
#include <type_traits>
#include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/callback_helpers.h" #include "base/callback_helpers.h"
......
...@@ -12,13 +12,12 @@ ...@@ -12,13 +12,12 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <va/va.h>
#include <set> #include <set>
#include <string> #include <string>
#include <vector> #include <vector>
#include <va/va.h>
#include "base/files/file.h" #include "base/files/file.h"
#include "base/gtest_prod_util.h" #include "base/gtest_prod_util.h"
#include "base/macros.h" #include "base/macros.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment