diff options
| author | avi <avi@chromium.org> | 2015-12-22 22:22:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 06:24:23 +0000 |
| commit | 1323b9c2b864dd0eabebd64bbc1fb4634c4ed30c (patch) | |
| tree | b0ebf20a45fa7d93b1ef0ee9c2708a1c827096fa | |
| parent | 5e82369982062eb995fda3ee241a529c0fc50dd0 (diff) | |
| download | chromium_src-1323b9c2b864dd0eabebd64bbc1fb4634c4ed30c.zip chromium_src-1323b9c2b864dd0eabebd64bbc1fb4634c4ed30c.tar.gz chromium_src-1323b9c2b864dd0eabebd64bbc1fb4634c4ed30c.tar.bz2 | |
Switch to standard integer types in media/, take 2.
This uses an automated script, so it'll catch things the first pass, done by hand, missed.
BUG=138542
TBR=dalecurtis@chromium.org
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1542013004
Cr-Commit-Position: refs/heads/master@{#366712}
738 files changed, 2220 insertions, 625 deletions
diff --git a/media/PRESUBMIT.py b/media/PRESUBMIT.py index 45612e0..d87000b 100644 --- a/media/PRESUBMIT.py +++ b/media/PRESUBMIT.py @@ -32,7 +32,7 @@ def _CheckForUseOfWrongClock(input_api, output_api): # # using base::Time; # ... - # int64 foo_us = foo_s * Time::kMicrosecondsPerSecond; + # int64_t foo_us = foo_s * Time::kMicrosecondsPerSecond; using_base_time_decl_pattern = r'^\s*using\s+(::)?base::Time\s*;' # Regular expression to detect references to the kXXX constants in the diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc index a6b4cc3..658dd19 100644 --- a/media/audio/alsa/alsa_input.cc +++ b/media/audio/alsa/alsa_input.cc @@ -4,8 +4,11 @@ #include "media/audio/alsa/alsa_input.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/audio/alsa/alsa_output.h" #include "media/audio/alsa/alsa_util.h" diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h index ed91446..f0b6d69 100644 --- a/media/audio/alsa/alsa_input.h +++ b/media/audio/alsa/alsa_input.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_ALSA_ALSA_INPUT_H_ #include <alsa/asoundlib.h> +#include <stdint.h> #include <string> diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc index 604f2d8..4ab571e 100644 --- a/media/audio/alsa/alsa_output.cc +++ b/media/audio/alsa/alsa_output.cc @@ -34,6 +34,8 @@ #include "media/audio/alsa/alsa_output.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h" diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h index 958f733..e67253f 100644 --- a/media/audio/alsa/alsa_output.h +++ b/media/audio/alsa/alsa_output.h @@ -22,6 +22,7 @@ #define MEDIA_AUDIO_ALSA_ALSA_OUTPUT_H_ #include <alsa/asoundlib.h> +#include <stdint.h> #include <string> diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc index 59cd889..1b13863 100644 --- a/media/audio/alsa/alsa_output_unittest.cc +++ b/media/audio/alsa/alsa_output_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "media/audio/alsa/alsa_output.h" #include "media/audio/alsa/alsa_wrapper.h" diff --git a/media/audio/alsa/alsa_util.cc b/media/audio/alsa/alsa_util.cc index f556dc0..76bdfbf 100644 --- a/media/audio/alsa/alsa_util.cc +++ b/media/audio/alsa/alsa_util.cc @@ -4,6 +4,8 @@ #include "media/audio/alsa/alsa_util.h" +#include <stddef.h> + #include "base/logging.h" #include "media/audio/alsa/alsa_wrapper.h" diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc index 29b6cb2..b32b4d7 100644 --- a/media/audio/alsa/audio_manager_alsa.cc +++ b/media/audio/alsa/audio_manager_alsa.cc @@ -4,10 +4,13 @@ #include "media/audio/alsa/audio_manager_alsa.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/nix/xdg_util.h" #include "base/process/launch.h" diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc index 1946219..a918a10 100644 --- a/media/audio/android/audio_android_unittest.cc +++ b/media/audio/android/audio_android_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/android/build_info.h" #include "base/bind.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h index 576bf08..055b3fd 100644 --- a/media/audio/android/audio_record_input.h +++ b/media/audio/android/audio_record_input.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_ #define MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_ +#include <stdint.h> + #include "base/android/jni_android.h" #include "base/macros.h" #include "base/threading/thread_checker.h" diff --git a/media/audio/android/opensles_input.cc b/media/audio/android/opensles_input.cc index 6a37cbfc..afbe02e 100644 --- a/media/audio/android/opensles_input.cc +++ b/media/audio/android/opensles_input.cc @@ -5,6 +5,7 @@ #include "media/audio/android/opensles_input.h" #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "media/audio/android/audio_manager_android.h" #include "media/base/audio_bus.h" diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h index ecb4ec9..b7b7e31 100644 --- a/media/audio/android/opensles_input.h +++ b/media/audio/android/opensles_input.h @@ -7,6 +7,7 @@ #include <SLES/OpenSLES.h> #include <SLES/OpenSLES_Android.h> +#include <stdint.h> #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/media/audio/android/opensles_output.cc b/media/audio/android/opensles_output.cc index 2a89f945..005b0e7 100644 --- a/media/audio/android/opensles_output.cc +++ b/media/audio/android/opensles_output.cc @@ -5,6 +5,7 @@ #include "media/audio/android/opensles_output.h" #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "media/audio/android/audio_manager_android.h" diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h index 9571575..9a6c968 100644 --- a/media/audio/android/opensles_output.h +++ b/media/audio/android/opensles_output.h @@ -7,6 +7,8 @@ #include <SLES/OpenSLES.h> #include <SLES/OpenSLES_Android.h> +#include <stddef.h> +#include <stdint.h> #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/media/audio/android/opensles_wrapper.cc b/media/audio/android/opensles_wrapper.cc index c2317b3..3bc3caf 100644 --- a/media/audio/android/opensles_wrapper.cc +++ b/media/audio/android/opensles_wrapper.cc @@ -14,6 +14,8 @@ #include <SLES/OpenSLES_Android.h> #undef const +#include <stddef.h> + #include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc index 81dab87..f4e00d4 100644 --- a/media/audio/audio_device_thread.cc +++ b/media/audio/audio_device_thread.cc @@ -4,6 +4,7 @@ #include "media/audio/audio_device_thread.h" +#include <stddef.h> #include <stdint.h> #include <algorithm> @@ -11,6 +12,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/message_loop/message_loop.h" #include "base/numerics/safe_conversions.h" diff --git a/media/audio/audio_device_thread.h b/media/audio/audio_device_thread.h index b910c71..7ec9d6e 100644 --- a/media/audio/audio_device_thread.h +++ b/media/audio/audio_device_thread.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_ #define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index fb722a4..28bc4b8 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -5,7 +5,11 @@ #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_ #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> + #include "base/atomicops.h" #include "base/callback.h" #include "base/files/file.h" @@ -16,6 +20,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc index cd17ca6..6a35d87 100644 --- a/media/audio/audio_input_controller_unittest.cc +++ b/media/audio/audio_input_controller_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index 91f1c68..ae64f34 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc @@ -4,11 +4,15 @@ #include "media/audio/audio_input_device.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/audio/audio_manager_base.h" #include "media/base/audio_bus.h" diff --git a/media/audio/audio_input_ipc.h b/media/audio/audio_input_ipc.h index cf8da50..5a0f7e0 100644 --- a/media/audio/audio_input_ipc.h +++ b/media/audio/audio_input_ipc.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_INPUT_IPC_H_ #define MEDIA_AUDIO_AUDIO_INPUT_IPC_H_ +#include <stdint.h> + #include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index cfa7084..abb47ce 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -2,13 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/environment.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_unittest_util.h" diff --git a/media/audio/audio_io.h b/media/audio/audio_io.h index b9665f8..66ff3f2 100644 --- a/media/audio/audio_io.h +++ b/media/audio/audio_io.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_IO_H_ #define MEDIA_AUDIO_AUDIO_IO_H_ +#include <stdint.h> + #include "media/base/audio_bus.h" // Low-level audio output support. To make sound there are 3 objects involved: diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 9598697..010b349 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc @@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/environment.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/synchronization/lock.h" diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc index 3602240..5074bbfa 100644 --- a/media/audio/audio_manager.cc +++ b/media/audio/audio_manager.cc @@ -4,6 +4,8 @@ #include "media/audio/audio_manager.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -12,6 +14,7 @@ #include "base/debug/dump_without_crashing.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "base/power_monitor/power_monitor.h" diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h index 1d88e44..0a61dfe 100644 --- a/media/audio/audio_manager.h +++ b/media/audio/audio_manager.h @@ -10,6 +10,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "media/audio/audio_device_name.h" #include "media/audio/audio_logging.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index fadd3fe..8b57d20 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index ced45be..0bc8f51 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -14,6 +14,7 @@ #include "base/memory/scoped_vector.h" #include "base/observer_list.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_output_dispatcher.h" diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc index 3156388..9a78152 100644 --- a/media/audio/audio_manager_unittest.cc +++ b/media/audio/audio_manager_unittest.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" +#include "build/build_config.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_output_proxy.h" diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h index 434f2e3..58e1e45 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_ #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_ +#include <stdint.h> + #include "base/atomic_ref_count.h" #include "base/callback.h" #include "base/macros.h" diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc index 2e1eedf..1046893 100644 --- a/media/audio/audio_output_controller_unittest.cc +++ b/media/audio/audio_output_controller_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/environment.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 418736f..6c5d59e 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc @@ -4,10 +4,15 @@ #include "media/audio/audio_output_device.h" +#include <stddef.h> +#include <stdint.h> + #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "media/audio/audio_output_controller.h" #include "media/base/limits.h" diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc index aa7e649..cad47e1 100644 --- a/media/audio/audio_output_device_unittest.cc +++ b/media/audio/audio_output_device_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <vector> #include "base/at_exit.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" #include "base/process/process_handle.h" diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h index b35a567..43c8bf8 100644 --- a/media/audio/audio_output_dispatcher_impl.h +++ b/media/audio/audio_output_dispatcher_impl.h @@ -13,6 +13,8 @@ #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_ #define MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_ +#include <stddef.h> + #include <map> #include <vector> diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index 71c2ad9..f037461 100644 --- a/media/audio/audio_output_proxy_unittest.cc +++ b/media/audio/audio_output_proxy_unittest.cc @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_output_dispatcher_impl.h" diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index e007d15..f3b24cd 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -4,9 +4,12 @@ #include "media/audio/audio_output_resampler.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/numerics/safe_conversions.h" #include "base/single_thread_task_runner.h" diff --git a/media/audio/audio_output_stream_sink.h b/media/audio/audio_output_stream_sink.h index 39456fe..9981a66 100644 --- a/media/audio/audio_output_stream_sink.h +++ b/media/audio/audio_output_stream_sink.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_ #define MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_ +#include <stdint.h> + #include <string> #include "base/compiler_specific.h" diff --git a/media/audio/audio_parameters.h b/media/audio/audio_parameters.h index e1ac6a5..3e6603b 100644 --- a/media/audio/audio_parameters.h +++ b/media/audio/audio_parameters.h @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/audio/point.h" #include "media/base/audio_bus.h" #include "media/base/channel_layout.h" diff --git a/media/audio/audio_parameters_unittest.cc b/media/audio/audio_parameters_unittest.cc index fa65a5c..194386b 100644 --- a/media/audio/audio_parameters_unittest.cc +++ b/media/audio/audio_parameters_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "media/audio/audio_parameters.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/audio_power_monitor_unittest.cc b/media/audio/audio_power_monitor_unittest.cc index 2b30578..35ef8fa 100644 --- a/media/audio/audio_power_monitor_unittest.cc +++ b/media/audio/audio_power_monitor_unittest.cc @@ -6,6 +6,7 @@ #include <limits> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/audio_bus.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/audio_streams_tracker.h b/media/audio/audio_streams_tracker.h index 18d510d..f501a21 100644 --- a/media/audio/audio_streams_tracker.h +++ b/media/audio/audio_streams_tracker.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_AUDIO_STREAMS_TRACKER_H_ #define MEDIA_AUDIO_AUDIO_STREAMS_TRACKER_H_ +#include <stddef.h> + #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/threading/thread_checker.h" diff --git a/media/audio/audio_streams_tracker_unittest.cc b/media/audio/audio_streams_tracker_unittest.cc index cd4addc..f42142b 100644 --- a/media/audio/audio_streams_tracker_unittest.cc +++ b/media/audio/audio_streams_tracker_unittest.cc @@ -4,6 +4,8 @@ #include "media/audio/audio_streams_tracker.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc index 036f6fd..2a9b77d 100644 --- a/media/audio/cras/audio_manager_cras.cc +++ b/media/audio/cras/audio_manager_cras.cc @@ -4,6 +4,8 @@ #include "media/audio/cras/audio_manager_cras.h" +#include <stddef.h> + #include <algorithm> #include "base/command_line.h" diff --git a/media/audio/cras/cras_input.cc b/media/audio/cras/cras_input.cc index d9fff0b..b464a63 100644 --- a/media/audio/cras/cras_input.cc +++ b/media/audio/cras/cras_input.cc @@ -7,6 +7,7 @@ #include <math.h> #include "base/logging.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/audio/audio_manager.h" #include "media/audio/cras/audio_manager_cras.h" diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h index 2e330dc..391366a 100644 --- a/media/audio/cras/cras_input.h +++ b/media/audio/cras/cras_input.h @@ -6,6 +6,8 @@ #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ #include <cras_client.h> +#include <stddef.h> +#include <stdint.h> #include <string> diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc index 7924207..3735322 100644 --- a/media/audio/cras/cras_input_unittest.cc +++ b/media/audio/cras/cras_input_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc index 1a2fa3e..ccaf11c 100644 --- a/media/audio/cras/cras_unified.cc +++ b/media/audio/cras/cras_unified.cc @@ -5,6 +5,7 @@ #include "media/audio/cras/cras_unified.h" #include "base/logging.h" +#include "base/macros.h" #include "media/audio/cras/audio_manager_cras.h" namespace media { diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h index b069b3c..c799d78 100644 --- a/media/audio/cras/cras_unified.h +++ b/media/audio/cras/cras_unified.h @@ -11,6 +11,8 @@ #define MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ #include <cras_client.h> +#include <stddef.h> +#include <stdint.h> #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc index 8062688..cb4d71b 100644 --- a/media/audio/cras/cras_unified_unittest.cc +++ b/media/audio/cras/cras_unified_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" diff --git a/media/audio/fake_audio_worker.cc b/media/audio/fake_audio_worker.cc index 44177d3..72fc163 100644 --- a/media/audio/fake_audio_worker.cc +++ b/media/audio/fake_audio_worker.cc @@ -9,6 +9,7 @@ #include "base/cancelable_callback.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" diff --git a/media/audio/fake_audio_worker_unittest.cc b/media/audio/fake_audio_worker_unittest.cc index 1cccf7e..9238109b7 100644 --- a/media/audio/fake_audio_worker_unittest.cc +++ b/media/audio/fake_audio_worker_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h index fe283c5..2b2c39c 100644 --- a/media/audio/mac/audio_auhal_mac.h +++ b/media/audio/mac/audio_auhal_mac.h @@ -19,6 +19,8 @@ #include <AudioUnit/AudioUnit.h> #include <CoreAudio/CoreAudio.h> +#include <stddef.h> +#include <stdint.h> #include "base/cancelable_callback.h" #include "base/compiler_specific.h" diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc index 8e75f3e..73191cd 100644 --- a/media/audio/mac/audio_auhal_mac_unittest.cc +++ b/media/audio/mac/audio_auhal_mac_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/audio/mac/audio_device_listener_mac_unittest.cc b/media/audio/mac/audio_device_listener_mac_unittest.cc index 12c88b6..a714ea0 100644 --- a/media/audio/mac/audio_device_listener_mac_unittest.cc +++ b/media/audio/mac/audio_device_listener_mac_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "media/audio/mac/audio_device_listener_mac.h" diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h index 0a0c443..32e9575 100644 --- a/media/audio/mac/audio_input_mac.h +++ b/media/audio/mac/audio_input_mac.h @@ -7,6 +7,7 @@ #include <AudioToolbox/AudioFormat.h> #include <AudioToolbox/AudioQueue.h> +#include <stdint.h> #include "base/cancelable_callback.h" #include "base/compiler_specific.h" diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h index 37167dc..29af0bf 100644 --- a/media/audio/mac/audio_low_latency_input_mac.h +++ b/media/audio/mac/audio_low_latency_input_mac.h @@ -38,6 +38,8 @@ #include <AudioUnit/AudioUnit.h> #include <CoreAudio/CoreAudio.h> +#include <stddef.h> +#include <stdint.h> #include "base/atomicops.h" #include "base/cancelable_callback.h" diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 22691a7..2ff9cd8 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/environment.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 16490f2..b7694f7 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -4,10 +4,13 @@ #include "media/audio/mac/audio_manager_mac.h" +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_observer.h" #include "base/strings/sys_string_conversions.h" diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h index 013a7f7..0a88b10 100644 --- a/media/audio/mac/audio_manager_mac.h +++ b/media/audio/mac/audio_manager_mac.h @@ -7,6 +7,7 @@ #include <AudioUnit/AudioUnit.h> #include <CoreAudio/AudioHardware.h> +#include <stddef.h> #include <list> #include <string> diff --git a/media/audio/mock_audio_source_callback.h b/media/audio/mock_audio_source_callback.h index be933d3..163451b 100644 --- a/media/audio/mock_audio_source_callback.h +++ b/media/audio/mock_audio_source_callback.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_ #define MEDIA_AUDIO_MOCK_AUDIO_SOURCE_CALLBACK_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/audio/audio_io.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/audio/point.cc b/media/audio/point.cc index 3246089..7745bc2 100644 --- a/media/audio/point.cc +++ b/media/audio/point.cc @@ -4,6 +4,8 @@ #include "media/audio/point.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/media/audio/pulse/pulse_input.cc b/media/audio/pulse/pulse_input.cc index b52eec6..8d4aeea 100644 --- a/media/audio/pulse/pulse_input.cc +++ b/media/audio/pulse/pulse_input.cc @@ -4,6 +4,8 @@ #include "media/audio/pulse/pulse_input.h" +#include <stdint.h> + #include "base/logging.h" #include "media/audio/pulse/audio_manager_pulse.h" #include "media/audio/pulse/pulse_util.h" diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h index e93c474..e0b2be9 100644 --- a/media/audio/pulse/pulse_input.h +++ b/media/audio/pulse/pulse_input.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_PULSE_PULSE_INPUT_H_ #include <pulse/pulseaudio.h> +#include <stddef.h> #include <string> #include "base/macros.h" diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc index 9cd2da4..953f9ac 100644 --- a/media/audio/pulse/pulse_output.cc +++ b/media/audio/pulse/pulse_output.cc @@ -5,6 +5,7 @@ #include "media/audio/pulse/pulse_output.h" #include <pulse/pulseaudio.h> +#include <stdint.h> #include "base/single_thread_task_runner.h" #include "media/audio/audio_manager_base.h" diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h index c241b84..ce9a589 100644 --- a/media/audio/pulse/pulse_output.h +++ b/media/audio/pulse/pulse_output.h @@ -20,6 +20,8 @@ #ifndef MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_ #define MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_ +#include <stddef.h> + #include <string> #include "base/macros.h" diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc index 7221707..5044fa4 100644 --- a/media/audio/pulse/pulse_util.cc +++ b/media/audio/pulse/pulse_util.cc @@ -4,7 +4,10 @@ #include "media/audio/pulse/pulse_util.h" +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/simple_sources.cc b/media/audio/simple_sources.cc index afcd8b9..6aee89f 100644 --- a/media/audio/simple_sources.cc +++ b/media/audio/simple_sources.cc @@ -3,11 +3,13 @@ // found in the LICENSE file. // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include <cmath> #include "media/audio/simple_sources.h" +#include <stddef.h> + #include <algorithm> +#include <cmath> #include "base/files/file.h" #include "base/lazy_instance.h" diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index 7d5c3c4..4f153e6 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_SIMPLE_SOURCES_H_ #define MEDIA_AUDIO_SIMPLE_SOURCES_H_ +#include <stdint.h> + #include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "media/audio/audio_io.h" diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc index c4c068e..ea52eea 100644 --- a/media/audio/simple_sources_unittest.cc +++ b/media/audio/simple_sources_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <limits> #include "base/files/file_util.h" diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc index 85ee6533..373a3ed 100644 --- a/media/audio/sounds/audio_stream_handler.cc +++ b/media/audio/sounds/audio_stream_handler.cc @@ -4,10 +4,13 @@ #include "media/audio/sounds/audio_stream_handler.h" +#include <stdint.h> + #include <string> #include "base/cancelable_callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/time/time.h" diff --git a/media/audio/sounds/audio_stream_handler.h b/media/audio/sounds/audio_stream_handler.h index 865e0f6..4a6b131 100644 --- a/media/audio/sounds/audio_stream_handler.h +++ b/media/audio/sounds/audio_stream_handler.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ #define MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/strings/string_piece.h" diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc index a559297..1b87ca4 100644 --- a/media/audio/sounds/audio_stream_handler_unittest.cc +++ b/media/audio/sounds/audio_stream_handler_unittest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/audio/sounds/sounds_manager.cc b/media/audio/sounds/sounds_manager.cc index 9774ce8..22ea05b 100644 --- a/media/audio/sounds/sounds_manager.cc +++ b/media/audio/sounds/sounds_manager.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" diff --git a/media/audio/sounds/sounds_manager_unittest.cc b/media/audio/sounds/sounds_manager_unittest.cc index 018fb5c..6dfcf11 100644 --- a/media/audio/sounds/sounds_manager_unittest.cc +++ b/media/audio/sounds/sounds_manager_unittest.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h index 1736028..c94505d 100644 --- a/media/audio/sounds/test_data.h +++ b/media/audio/sounds/test_data.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_SOUNDS_TEST_DATA_H_ #define MEDIA_AUDIO_SOUNDS_TEST_DATA_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/media/audio/sounds/wav_audio_handler.cc b/media/audio/sounds/wav_audio_handler.cc index 22645ea..a7c2b14 100644 --- a/media/audio/sounds/wav_audio_handler.cc +++ b/media/audio/sounds/wav_audio_handler.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/sys_byteorder.h" +#include "build/build_config.h" #include "media/base/audio_bus.h" namespace media { diff --git a/media/audio/sounds/wav_audio_handler.h b/media/audio/sounds/wav_audio_handler.h index 1ea1972..83c99b4 100644 --- a/media/audio/sounds/wav_audio_handler.h +++ b/media/audio/sounds/wav_audio_handler.h @@ -5,6 +5,9 @@ #ifndef MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ #define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" diff --git a/media/audio/sounds/wav_audio_handler_unittest.cc b/media/audio/sounds/wav_audio_handler_unittest.cc index 0f2304a..92896fa 100644 --- a/media/audio/sounds/wav_audio_handler_unittest.cc +++ b/media/audio/sounds/wav_audio_handler_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" #include "media/audio/sounds/test_data.h" diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h index 3370f36..2618d5f 100644 --- a/media/audio/virtual_audio_input_stream.h +++ b/media/audio/virtual_audio_input_stream.h @@ -5,6 +5,8 @@ #ifndef MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_ #define MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_ +#include <stdint.h> + #include <map> #include <set> diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc index 392b505..5d86a2f 100644 --- a/media/audio/virtual_audio_input_stream_unittest.cc +++ b/media/audio/virtual_audio_input_stream_unittest.cc @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <list> #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" diff --git a/media/audio/virtual_audio_output_stream.cc b/media/audio/virtual_audio_output_stream.cc index 81c40cc..1740b40 100644 --- a/media/audio/virtual_audio_output_stream.cc +++ b/media/audio/virtual_audio_output_stream.cc @@ -4,6 +4,8 @@ #include "media/audio/virtual_audio_output_stream.h" +#include <stdint.h> + #include "base/logging.h" #include "media/audio/virtual_audio_input_stream.h" diff --git a/media/audio/virtual_audio_output_stream_unittest.cc b/media/audio/virtual_audio_output_stream_unittest.cc index 0ea753a..a391f6e 100644 --- a/media/audio/virtual_audio_output_stream_unittest.cc +++ b/media/audio/virtual_audio_output_stream_unittest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "media/audio/audio_manager.h" diff --git a/media/audio/win/audio_device_listener_win_unittest.cc b/media/audio/win/audio_device_listener_win_unittest.cc index 4b78d93..97de0a2 100644 --- a/media/audio/win/audio_device_listener_win_unittest.cc +++ b/media/audio/win/audio_device_listener_win_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h index e5278b5..bdde764 100644 --- a/media/audio/win/audio_low_latency_input_win.h +++ b/media/audio/win/audio_low_latency_input_win.h @@ -58,6 +58,8 @@ #include <Audioclient.h> #include <MMDeviceAPI.h> +#include <stddef.h> +#include <stdint.h> #include <string> diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc index 3190b7b..8a9f366 100644 --- a/media/audio/win/audio_low_latency_input_win_unittest.cc +++ b/media/audio/win/audio_low_latency_input_win_unittest.cc @@ -4,9 +4,12 @@ #include <windows.h> #include <mmsystem.h> +#include <stddef.h> +#include <stdint.h> #include "base/environment.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc index 23467f7..87b79d0 100644 --- a/media/audio/win/audio_low_latency_output_win.cc +++ b/media/audio/win/audio_low_latency_output_win.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h index 16f9649..c62a44c 100644 --- a/media/audio/win/audio_low_latency_output_win.h +++ b/media/audio/win/audio_low_latency_output_win.h @@ -95,6 +95,8 @@ #include <Audioclient.h> #include <MMDeviceAPI.h> +#include <stddef.h> +#include <stdint.h> #include <string> diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc index 075cd7d..5b748e7 100644 --- a/media/audio/win/audio_low_latency_output_win_unittest.cc +++ b/media/audio/win/audio_low_latency_output_win_unittest.cc @@ -4,6 +4,8 @@ #include <windows.h> #include <mmsystem.h> +#include <stddef.h> +#include <stdint.h> #include "base/environment.h" #include "base/files/file_util.h" diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index 70e6c1b..ba8f665 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc @@ -9,6 +9,7 @@ #include <initguid.h> #include <mmsystem.h> #include <setupapi.h> +#include <stddef.h> #include "base/bind.h" #include "base/bind_helpers.h" diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index 5b5a2e7..0c59d9b 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -4,18 +4,20 @@ #include <windows.h> #include <mmsystem.h> +#include <stddef.h> +#include <stdint.h> #include "base/base_paths.h" #include "base/memory/aligned_memory.h" #include "base/sync_socket.h" #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -#include "media/base/limits.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_unittest_util.h" #include "media/audio/mock_audio_source_callback.h" #include "media/audio/simple_sources.h" +#include "media/base/limits.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/win/avrt_wrapper_win.cc b/media/audio/win/avrt_wrapper_win.cc index c9f1599..ace5cba 100644 --- a/media/audio/win/avrt_wrapper_win.cc +++ b/media/audio/win/avrt_wrapper_win.cc @@ -5,6 +5,7 @@ #include "media/audio/win/avrt_wrapper_win.h" #include "base/logging.h" +#include "base/macros.h" namespace avrt { diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc index 48d8575..fa0300c 100644 --- a/media/audio/win/core_audio_util_win.cc +++ b/media/audio/win/core_audio_util_win.cc @@ -7,9 +7,11 @@ #include <devicetopology.h> #include <dxdiag.h> #include <functiondiscoverykeys_devpkey.h> +#include <stddef.h> #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_co_mem.h" diff --git a/media/audio/win/core_audio_util_win.h b/media/audio/win/core_audio_util_win.h index 3b04da2..92410da 100644 --- a/media/audio/win/core_audio_util_win.h +++ b/media/audio/win/core_audio_util_win.h @@ -13,6 +13,7 @@ #include <audioclient.h> #include <mmdeviceapi.h> +#include <stdint.h> #include <string> #include "base/macros.h" diff --git a/media/audio/win/core_audio_util_win_unittest.cc b/media/audio/win/core_audio_util_win_unittest.cc index 1f5b2e0..2dc53a129 100644 --- a/media/audio/win/core_audio_util_win_unittest.cc +++ b/media/audio/win/core_audio_util_win_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" diff --git a/media/audio/win/device_enumeration_win.cc b/media/audio/win/device_enumeration_win.cc index 47d5bbd..596389c 100644 --- a/media/audio/win/device_enumeration_win.cc +++ b/media/audio/win/device_enumeration_win.cc @@ -5,6 +5,7 @@ #include <MMDeviceAPI.h> #include <mmsystem.h> #include <Functiondiscoverykeys_devpkey.h> // MMDeviceAPI.h must come first +#include <stddef.h> #include "media/audio/win/audio_manager_win.h" diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h index b42b55a..7d8a40f 100644 --- a/media/audio/win/wavein_input_win.h +++ b/media/audio/win/wavein_input_win.h @@ -9,6 +9,7 @@ #include <windows.h> #include <mmsystem.h> +#include <stdint.h> #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index 62fe828..4ff1444 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -8,6 +8,8 @@ #include <windows.h> #include <mmsystem.h> #include <mmreg.h> +#include <stddef.h> +#include <stdint.h> #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/android/access_unit_queue.h b/media/base/android/access_unit_queue.h index d6ea33d..07feb99 100644 --- a/media/base/android/access_unit_queue.h +++ b/media/base/android/access_unit_queue.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_ #define MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_ +#include <stddef.h> + #include <list> #include "base/macros.h" diff --git a/media/base/android/access_unit_queue_unittest.cc b/media/base/android/access_unit_queue_unittest.cc index e82450c..f2b4fbb 100644 --- a/media/base/android/access_unit_queue_unittest.cc +++ b/media/base/android/access_unit_queue_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "media/base/android/access_unit_queue.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h index 1537c04..8b1b4e9 100644 --- a/media/base/android/audio_decoder_job.h +++ b/media/base/android/audio_decoder_job.h @@ -6,6 +6,8 @@ #define MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_ #include <jni.h> +#include <stddef.h> +#include <stdint.h> #include <vector> #include "base/callback.h" diff --git a/media/base/android/demuxer_stream_player_params.h b/media/base/android/demuxer_stream_player_params.h index db89c18..f7619c6 100644 --- a/media/base/android/demuxer_stream_player_params.h +++ b/media/base/android/demuxer_stream_player_params.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ +#include <stdint.h> + #include <vector> #include "media/base/audio_decoder_config.h" diff --git a/media/base/android/media_client_android.h b/media/base/android/media_client_android.h index 0753b3b..132865d 100644 --- a/media/base/android/media_client_android.h +++ b/media/base/android/media_client_android.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ #define MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ +#include <stdint.h> + #include <string> #include <utility> #include <vector> diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h index 6b9a143..434edf0 100644 --- a/media/base/android/media_codec_audio_decoder.h +++ b/media/base/android/media_codec_audio_decoder.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "media/base/android/media_codec_decoder.h" diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index 0b103ae..41a7351 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ +#include <stddef.h> #include <stdint.h> #include <set> diff --git a/media/base/android/media_codec_decoder.h b/media/base/android/media_codec_decoder.h index 8385d60..82b4d7b 100644 --- a/media/base/android/media_codec_decoder.h +++ b/media/base/android/media_codec_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_DECODER_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_DECODER_H_ +#include <stddef.h> + #include "base/android/scoped_java_ref.h" #include "base/callback.h" #include "base/macros.h" diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc index 2b14820..80f1cb6 100644 --- a/media/base/android/media_codec_decoder_unittest.cc +++ b/media/base/android/media_codec_decoder_unittest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "base/timer/timer.h" #include "media/base/android/media_codec_audio_decoder.h" diff --git a/media/base/android/media_codec_player_unittest.cc b/media/base/android/media_codec_player_unittest.cc index 628de1ce..b687989 100644 --- a/media/base/android/media_codec_player_unittest.cc +++ b/media/base/android/media_codec_player_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "media/base/android/demuxer_android.h" #include "media/base/android/media_codec_player.h" diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc index 4307c00..c5f7022 100644 --- a/media/base/android/media_codec_util.cc +++ b/media/base/android/media_codec_util.cc @@ -4,6 +4,8 @@ #include "media/base/android/media_codec_util.h" +#include <stddef.h> + #include <algorithm> #include "base/android/build_info.h" diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h index b0fc798..b7fc395 100644 --- a/media/base/android/media_codec_video_decoder.h +++ b/media/base/android/media_codec_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ +#include <stddef.h> + #include <set> #include "base/macros.h" #include "media/base/android/media_codec_decoder.h" diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h index 7d45718..b0136aa 100644 --- a/media/base/android/media_decoder_job.h +++ b/media/base/android/media_decoder_job.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc index d8bb6dc..f3ba95d 100644 --- a/media/base/android/media_drm_bridge.cc +++ b/media/base/android/media_drm_bridge.cc @@ -4,6 +4,8 @@ #include "media/base/android/media_drm_bridge.h" +#include <stddef.h> + #include <algorithm> #include "base/android/build_info.h" @@ -15,6 +17,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h index 1227ba2..4ca5fa6 100644 --- a/media/base/android/media_drm_bridge.h +++ b/media/base/android/media_drm_bridge.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ #include <jni.h> +#include <stdint.h> #include <string> #include <vector> diff --git a/media/base/android/media_drm_bridge_delegate.h b/media/base/android/media_drm_bridge_delegate.h index 7a18dac..52bf61c 100644 --- a/media/base/android/media_drm_bridge_delegate.h +++ b/media/base/android/media_drm_bridge_delegate.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_ #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc index 70f16eb..375748e 100644 --- a/media/base/android/media_jni_registrar.cc +++ b/media/base/android/media_jni_registrar.cc @@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "media/audio/android/audio_manager_android.h" #include "media/audio/android/audio_record_input.h" diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index 67681185..ed84daf 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ #include <jni.h> +#include <stdint.h> #include <map> #include <string> diff --git a/media/base/android/media_player_bridge_unittest.cc b/media/base/android/media_player_bridge_unittest.cc index 77cfb69..7d0136b 100644 --- a/media/base/android/media_player_bridge_unittest.cc +++ b/media/base/android/media_player_bridge_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/android/media_player_bridge.h" #include "media/base/android/media_player_manager.h" diff --git a/media/base/android/media_resource_getter.h b/media/base/android/media_resource_getter.h index a0d1bb4..81987c9 100644 --- a/media/base/android/media_resource_getter.h +++ b/media/base/android/media_resource_getter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_RESOURCE_GETTER_H_ #define MEDIA_BASE_ANDROID_MEDIA_RESOURCE_GETTER_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc index eaa7269..c36d458 100644 --- a/media/base/android/media_source_player.cc +++ b/media/base/android/media_source_player.cc @@ -4,6 +4,9 @@ #include "media/base/android/media_source_player.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> #include "base/android/jni_android.h" @@ -13,6 +16,7 @@ #include "base/bind_helpers.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "media/base/android/audio_decoder_job.h" diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc index 16e0b29..0704a49 100644 --- a/media/base/android/media_source_player_unittest.cc +++ b/media/base/android/media_source_player_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/base/android/audio_decoder_job.h" #include "media/base/android/media_codec_util.h" #include "media/base/android/media_drm_bridge.h" diff --git a/media/base/android/media_url_interceptor.h b/media/base/android/media_url_interceptor.h index 4ecb0d8..5189033 100644 --- a/media/base/android/media_url_interceptor.h +++ b/media/base/android/media_url_interceptor.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_URL_INTERCEPTOR_H_ #define MEDIA_BASE_ANDROID_MEDIA_URL_INTERCEPTOR_H_ +#include <stdint.h> + #include <string> #include "base/android/jni_android.h" diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h index d16d6f8..f3f66bc 100644 --- a/media/base/android/ndk_media_codec_bridge.h +++ b/media/base/android/ndk_media_codec_bridge.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ #include <media/NdkMediaCodec.h> +#include <stddef.h> #include <stdint.h> #include "base/macros.h" diff --git a/media/base/android/ndk_media_codec_wrapper.cc b/media/base/android/ndk_media_codec_wrapper.cc index e2d916e..e4709a6 100644 --- a/media/base/android/ndk_media_codec_wrapper.cc +++ b/media/base/android/ndk_media_codec_wrapper.cc @@ -7,6 +7,8 @@ #include <media/NdkMediaCodec.h> #include <media/NdkMediaFormat.h> +#include <stddef.h> +#include <stdint.h> #include "base/files/file_path.h" #include "base/logging.h" diff --git a/media/base/android/sdk_media_codec_bridge.h b/media/base/android/sdk_media_codec_bridge.h index c495ffc9..9079cba 100644 --- a/media/base/android/sdk_media_codec_bridge.h +++ b/media/base/android/sdk_media_codec_bridge.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ #include <jni.h> +#include <stddef.h> #include <stdint.h> #include <set> diff --git a/media/base/android/sdk_media_codec_bridge_unittest.cc b/media/base/android/sdk_media_codec_bridge_unittest.cc index 31fa690..ef32acf 100644 --- a/media/base/android/sdk_media_codec_bridge_unittest.cc +++ b/media/base/android/sdk_media_codec_bridge_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/logging.h" diff --git a/media/base/android/test_data_factory.h b/media/base/android/test_data_factory.h index c831c24..6fb16d7 100644 --- a/media/base/android/test_data_factory.h +++ b/media/base/android/test_data_factory.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_TEST_DATA_FACTORY_H_ #define MEDIA_BASE_ANDROID_TEST_DATA_FACTORY_H_ +#include <stddef.h> #include <stdint.h> #include <set> #include <vector> diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h index 03b6764..c15d260 100644 --- a/media/base/android/video_decoder_job.h +++ b/media/base/android/video_decoder_job.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ #include <jni.h> +#include <stddef.h> #include "base/macros.h" #include "media/base/android/media_decoder_job.h" diff --git a/media/base/android/webaudio_media_codec_bridge.cc b/media/base/android/webaudio_media_codec_bridge.cc index 5c60e11..c38ba75 100644 --- a/media/base/android/webaudio_media_codec_bridge.cc +++ b/media/base/android/webaudio_media_codec_bridge.cc @@ -6,6 +6,7 @@ #include <errno.h> #include <fcntl.h> +#include <stddef.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/media/base/android/webaudio_media_codec_bridge.h b/media/base/android/webaudio_media_codec_bridge.h index 2d61001..cd40843 100644 --- a/media/base/android/webaudio_media_codec_bridge.h +++ b/media/base/android/webaudio_media_codec_bridge.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_WEBAUDIO_MEDIA_CODEC_BRIDGE_H_ #include <jni.h> +#include <stdint.h> #include "base/android/scoped_java_ref.h" #include "base/callback.h" diff --git a/media/base/audio_block_fifo.cc b/media/base/audio_block_fifo.cc index 31aa3c9..4313cad7 100644 --- a/media/base/audio_block_fifo.cc +++ b/media/base/audio_block_fifo.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <algorithm> #include "media/base/audio_block_fifo.h" diff --git a/media/base/audio_block_fifo_unittest.cc b/media/base/audio_block_fifo_unittest.cc index 81ddecc..d9cfb7e 100644 --- a/media/base/audio_block_fifo_unittest.cc +++ b/media/base/audio_block_fifo_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/time/time.h" #include "media/audio/audio_power_monitor.h" #include "media/base/audio_block_fifo.h" diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h index 8508689..8ae281e 100644 --- a/media/base/audio_buffer.h +++ b/media/base/audio_buffer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_AUDIO_BUFFER_H_ #define MEDIA_BASE_AUDIO_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/base/audio_buffer_converter_unittest.cc b/media/base/audio_buffer_converter_unittest.cc index d48e5f6..712ef7b 100644 --- a/media/base/audio_buffer_converter_unittest.cc +++ b/media/base/audio_buffer_converter_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/audio_buffer_converter.h" diff --git a/media/base/audio_bus.cc b/media/base/audio_bus.cc index 8466c2a..2b0379a 100644 --- a/media/base/audio_bus.cc +++ b/media/base/audio_bus.cc @@ -4,6 +4,7 @@ #include "media/base/audio_bus.h" +#include <stddef.h> #include <stdint.h> #include <limits> diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index 3a245b7..d6bd874 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_BUS_H_ #define MEDIA_BASE_AUDIO_BUS_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/base/audio_bus_perftest.cc b/media/base/audio_bus_perftest.cc index 80e089e..8f35b90 100644 --- a/media/base/audio_bus_perftest.cc +++ b/media/base/audio_bus_perftest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/fake_audio_render_callback.h" diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc index 83abe3f..dadb8e98 100644 --- a/media/base/audio_bus_unittest.cc +++ b/media/base/audio_bus_unittest.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <limits> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/media/base/audio_converter_unittest.cc b/media/base/audio_converter_unittest.cc index d427923..78d1b16 100644 --- a/media/base/audio_converter_unittest.cc +++ b/media/base/audio_converter_unittest.cc @@ -5,8 +5,11 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES +#include <stddef.h> + #include <cmath> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string_number_conversions.h" diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h index 4607fa8..e88c0eb 100644 --- a/media/base/audio_decoder_config.h +++ b/media/base/audio_decoder_config.h @@ -5,9 +5,12 @@ #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/channel_layout.h" #include "media/base/media_export.h" diff --git a/media/base/audio_discard_helper.h b/media/base/audio_discard_helper.h index 94cf2e5..4b021fe 100644 --- a/media/base/audio_discard_helper.h +++ b/media/base/audio_discard_helper.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ #define MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ +#include <stddef.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" diff --git a/media/base/audio_discard_helper_unittest.cc b/media/base/audio_discard_helper_unittest.cc index 0f9a518..692f065 100644 --- a/media/base/audio_discard_helper_unittest.cc +++ b/media/base/audio_discard_helper_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" diff --git a/media/base/audio_fifo_unittest.cc b/media/base/audio_fifo_unittest.cc index 1bdd9c6..7376f99 100644 --- a/media/base/audio_fifo_unittest.cc +++ b/media/base/audio_fifo_unittest.cc @@ -4,6 +4,7 @@ // TODO(henrika): add test which included |start_frame| in Consume() call. +#include "base/macros.h" #include "media/base/audio_fifo.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/audio_hardware_config.cc b/media/base/audio_hardware_config.cc index ca34f5e..c4b5615 100644 --- a/media/base/audio_hardware_config.cc +++ b/media/base/audio_hardware_config.cc @@ -4,6 +4,8 @@ #include "media/base/audio_hardware_config.h" +#include <stdint.h> + #include <algorithm> #include <cmath> diff --git a/media/base/audio_hash.cc b/media/base/audio_hash.cc index bc75288..d879e54 100644 --- a/media/base/audio_hash.cc +++ b/media/base/audio_hash.cc @@ -8,6 +8,7 @@ #include "media/base/audio_hash.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "media/base/audio_bus.h" diff --git a/media/base/audio_hash.h b/media/base/audio_hash.h index 71a6507..83ee901 100644 --- a/media/base/audio_hash.h +++ b/media/base/audio_hash.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_AUDIO_HASH_H_ #define MEDIA_BASE_AUDIO_HASH_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/base/audio_hash_unittest.cc b/media/base/audio_hash_unittest.cc index 742deed..b020fe9 100644 --- a/media/base/audio_hash_unittest.cc +++ b/media/base/audio_hash_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "media/base/audio_bus.h" #include "media/base/audio_hash.h" #include "media/base/fake_audio_render_callback.h" diff --git a/media/base/audio_pull_fifo_unittest.cc b/media/base/audio_pull_fifo_unittest.cc index dc90a6d94..e6a7362 100644 --- a/media/base/audio_pull_fifo_unittest.cc +++ b/media/base/audio_pull_fifo_unittest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "media/base/audio_bus.h" #include "media/base/audio_pull_fifo.h" diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h index c84779d..dae8b7c 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ +#include <stdint.h> + #include <map> #include <string> diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc index c01c9ac..b9a2c7b 100644 --- a/media/base/audio_renderer_mixer_input_unittest.cc +++ b/media/base/audio_renderer_mixer_input_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/run_loop.h" #include "media/base/audio_renderer_mixer.h" #include "media/base/audio_renderer_mixer_input.h" diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc index 8f45c2b..fb81c0f 100644 --- a/media/base/audio_renderer_mixer_unittest.cc +++ b/media/base/audio_renderer_mixer_unittest.cc @@ -4,10 +4,14 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES + +#include <stddef.h> + #include <cmath> #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/synchronization/waitable_event.h" diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h index 066ff1f..9da243b 100644 --- a/media/base/audio_renderer_sink.h +++ b/media/base/audio_renderer_sink.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_RENDERER_SINK_H_ #define MEDIA_BASE_AUDIO_RENDERER_SINK_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/base/audio_shifter.h b/media/base/audio_shifter.h index 98239a4..e7bc502 100644 --- a/media/base/audio_shifter.h +++ b/media/base/audio_shifter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_SHIFTER_H #define MEDIA_BASE_AUDIO_SHIFTER_H +#include <stddef.h> + #include <deque> #include "base/memory/linked_ptr.h" diff --git a/media/base/audio_shifter_unittest.cc b/media/base/audio_shifter_unittest.cc index e47067e..f424033e 100644 --- a/media/base/audio_shifter_unittest.cc +++ b/media/base/audio_shifter_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <cmath> #include <vector> diff --git a/media/base/audio_splicer.cc b/media/base/audio_splicer.cc index 4178cee..cc0c72b 100644 --- a/media/base/audio_splicer.cc +++ b/media/base/audio_splicer.cc @@ -4,10 +4,13 @@ #include "media/base/audio_splicer.h" +#include <stdint.h> + #include <cstdlib> #include <deque> #include "base/logging.h" +#include "base/macros.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/audio_decoder_config.h" diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc index 92ab9d2..5d55600 100644 --- a/media/base/audio_splicer_unittest.cc +++ b/media/base/audio_splicer_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" diff --git a/media/base/audio_timestamp_helper.h b/media/base/audio_timestamp_helper.h index 1ec4120..511bdb9 100644 --- a/media/base/audio_timestamp_helper.h +++ b/media/base/audio_timestamp_helper.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ #define MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/audio_timestamp_helper_unittest.cc b/media/base/audio_timestamp_helper_unittest.cc index a17ff2c..0bb6e12 100644 --- a/media/base/audio_timestamp_helper_unittest.cc +++ b/media/base/audio_timestamp_helper_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "media/base/audio_timestamp_helper.h" #include "media/base/timestamp_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/bit_reader.h b/media/base/bit_reader.h index b91145c..95c34f2 100644 --- a/media/base/bit_reader.h +++ b/media/base/bit_reader.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_BIT_READER_H_ #define MEDIA_BASE_BIT_READER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/bit_reader_core.h b/media/base/bit_reader_core.h index a40e405..1196298 100644 --- a/media/base/bit_reader_core.h +++ b/media/base/bit_reader_core.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_BIT_READER_CORE_H_ #define MEDIA_BASE_BIT_READER_CORE_H_ +#include <stdint.h> + #include "base/logging.h" #include "base/macros.h" #include "media/base/media_export.h" diff --git a/media/base/bit_reader_unittest.cc b/media/base/bit_reader_unittest.cc index 1f5d0a7..491aaf2 100644 --- a/media/base/bit_reader_unittest.cc +++ b/media/base/bit_reader_unittest.cc @@ -4,6 +4,10 @@ #include "media/base/bit_reader.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/base/bitstream_buffer.h b/media/base/bitstream_buffer.h index c3a4a0b..fe3c8da3 100644 --- a/media/base/bitstream_buffer.h +++ b/media/base/bitstream_buffer.h @@ -5,6 +5,10 @@ #ifndef MEDIA_BASE_BITSTREAM_BUFFER_H_ #define MEDIA_BASE_BITSTREAM_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/time/time.h" #include "media/base/decrypt_config.h" diff --git a/media/base/byte_queue.h b/media/base/byte_queue.h index e9aedd9..9a14ded 100644 --- a/media/base/byte_queue.h +++ b/media/base/byte_queue.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_BYTE_QUEUE_H_ #define MEDIA_BASE_BYTE_QUEUE_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/cdm_callback_promise.h b/media/base/cdm_callback_promise.h index 875fb78..b271a79 100644 --- a/media/base/cdm_callback_promise.h +++ b/media/base/cdm_callback_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/base/cdm_initialized_promise.h b/media/base/cdm_initialized_promise.h index 567fb92..cc11f31 100644 --- a/media/base/cdm_initialized_promise.h +++ b/media/base/cdm_initialized_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_ #define MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "media/base/cdm_factory.h" #include "media/base/cdm_promise.h" diff --git a/media/base/cdm_key_information.h b/media/base/cdm_key_information.h index 108786d..89c8112 100644 --- a/media/base/cdm_key_information.h +++ b/media/base/cdm_key_information.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_CDM_KEY_INFORMATION_H_ #define MEDIA_BASE_CDM_KEY_INFORMATION_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h index 2c74483..0c44f80 100644 --- a/media/base/cdm_promise.h +++ b/media/base/cdm_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_CDM_PROMISE_H_ #define MEDIA_BASE_CDM_PROMISE_H_ +#include <stdint.h> + #include <string> #include "base/logging.h" diff --git a/media/base/cdm_promise_adapter.h b/media/base/cdm_promise_adapter.h index 0e7006d..f514439 100644 --- a/media/base/cdm_promise_adapter.h +++ b/media/base/cdm_promise_adapter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_CDM_PROMISE_ADAPTER_H_ #define MEDIA_BASE_CDM_PROMISE_ADAPTER_H_ +#include <stdint.h> + #include "base/containers/scoped_ptr_hash_map.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/channel_layout.cc b/media/base/channel_layout.cc index 237c414..9d85842 100644 --- a/media/base/channel_layout.cc +++ b/media/base/channel_layout.cc @@ -4,7 +4,10 @@ #include "media/base/channel_layout.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" namespace media { diff --git a/media/base/channel_mixer.cc b/media/base/channel_mixer.cc index 54b59a8..cae3057 100644 --- a/media/base/channel_mixer.cc +++ b/media/base/channel_mixer.cc @@ -4,6 +4,8 @@ #include "media/base/channel_mixer.h" +#include <stddef.h> + #include "base/logging.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc index 1eb2616..3be74ee 100644 --- a/media/base/channel_mixer_unittest.cc +++ b/media/base/channel_mixer_unittest.cc @@ -7,6 +7,7 @@ #include <cmath> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" diff --git a/media/base/channel_mixing_matrix.cc b/media/base/channel_mixing_matrix.cc index eee0efd..a508b67 100644 --- a/media/base/channel_mixing_matrix.cc +++ b/media/base/channel_mixing_matrix.cc @@ -7,6 +7,8 @@ #include "media/base/channel_mixing_matrix.h" +#include <stddef.h> + #include <algorithm> #include <cmath> diff --git a/media/base/channel_mixing_matrix_unittest.cc b/media/base/channel_mixing_matrix_unittest.cc index dcba54f..16dc53b 100644 --- a/media/base/channel_mixing_matrix_unittest.cc +++ b/media/base/channel_mixing_matrix_unittest.cc @@ -7,8 +7,11 @@ #include "media/base/channel_mixing_matrix.h" +#include <stddef.h> + #include <cmath> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/container_names.cc b/media/base/container_names.cc index 1573e86..8bcb3c0 100644 --- a/media/base/container_names.cc +++ b/media/base/container_names.cc @@ -4,10 +4,13 @@ #include "media/base/container_names.h" +#include <stddef.h> + #include <cctype> #include <limits> #include "base/logging.h" +#include "base/macros.h" #include "media/base/bit_reader.h" namespace media { diff --git a/media/base/container_names_unittest.cc b/media/base/container_names_unittest.cc index d758bf1..4b71c32 100644 --- a/media/base/container_names_unittest.cc +++ b/media/base/container_names_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/file_util.h" #include "media/base/container_names.h" #include "media/base/test_data_util.h" diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h index 6ae50f1..da353ce 100644 --- a/media/base/data_buffer.h +++ b/media/base/data_buffer.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DATA_BUFFER_H_ #define MEDIA_BASE_DATA_BUFFER_H_ +#include <stdint.h> + #include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc index 55bc496..c06e087 100644 --- a/media/base/data_buffer_unittest.cc +++ b/media/base/data_buffer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_util.h" #include "media/base/data_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/data_source.h b/media/base/data_source.h index cfd185f..5aeea83 100644 --- a/media/base/data_source.h +++ b/media/base/data_source.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DATA_SOURCE_H_ #define MEDIA_BASE_DATA_SOURCE_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/time/time.h" diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h index ea4b044..ae1a993 100644 --- a/media/base/decoder_buffer.h +++ b/media/base/decoder_buffer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_DECODER_BUFFER_H_ #define MEDIA_BASE_DECODER_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <utility> diff --git a/media/base/decoder_buffer_queue.h b/media/base/decoder_buffer_queue.h index 8a097f6..32a6af5 100644 --- a/media/base/decoder_buffer_queue.h +++ b/media/base/decoder_buffer_queue.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ #define MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ +#include <stddef.h> + #include <deque> #include "base/macros.h" diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc index f3d8216..7380f41 100644 --- a/media/base/decoder_buffer_unittest.cc +++ b/media/base/decoder_buffer_unittest.cc @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "media/base/decoder_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc index c15ac73..2c5935a 100644 --- a/media/base/decrypt_config.cc +++ b/media/base/decrypt_config.cc @@ -4,6 +4,8 @@ #include "media/base/decrypt_config.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h index cc6ccae..c90a3bc 100644 --- a/media/base/decrypt_config.h +++ b/media/base/decrypt_config.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DECRYPT_CONFIG_H_ #define MEDIA_BASE_DECRYPT_CONFIG_H_ +#include <stdint.h> + #include <iosfwd> #include <string> #include <vector> diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 7be31ab..cc9f665 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DEMUXER_H_ #define MEDIA_BASE_DEMUXER_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc index dbdd4f9..6743ac6c 100644 --- a/media/base/demuxer_perftest.cc +++ b/media/base/demuxer_perftest.cc @@ -2,11 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/at_exit.h" #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/media.h" #include "media/base/media_log.h" #include "media/base/test_data_util.h" diff --git a/media/base/djb2_unittest.cc b/media/base/djb2_unittest.cc index f95d747..e445089 100644 --- a/media/base/djb2_unittest.cc +++ b/media/base/djb2_unittest.cc @@ -4,6 +4,8 @@ #include "media/base/djb2.h" +#include <stdint.h> + #include "testing/gtest/include/gtest/gtest.h" uint8_t kTestData[] = {1, 2, 3}; diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h index 87c3382..a7d74dd 100644 --- a/media/base/fake_audio_render_callback.h +++ b/media/base/fake_audio_render_callback.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ #define MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/base/fake_audio_renderer_sink.h b/media/base/fake_audio_renderer_sink.h index 8ac055a..afdd018 100644 --- a/media/base/fake_audio_renderer_sink.h +++ b/media/base/fake_audio_renderer_sink.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_FAKE_AUDIO_RENDERER_SINK_H_ #define MEDIA_BASE_FAKE_AUDIO_RENDERER_SINK_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc index e384e09..267b3e5 100644 --- a/media/base/fake_demuxer_stream.cc +++ b/media/base/fake_demuxer_stream.cc @@ -4,12 +4,15 @@ #include "media/base/fake_demuxer_stream.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "media/base/bind_to_current_loop.h" diff --git a/media/base/fake_demuxer_stream_unittest.cc b/media/base/fake_demuxer_stream_unittest.cc index 3ab750f..a4adeb1 100644 --- a/media/base/fake_demuxer_stream_unittest.cc +++ b/media/base/fake_demuxer_stream_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "media/base/decoder_buffer.h" diff --git a/media/base/fake_text_track_stream.cc b/media/base/fake_text_track_stream.cc index a9c6df8..cc26df4 100644 --- a/media/base/fake_text_track_stream.cc +++ b/media/base/fake_text_track_stream.cc @@ -4,6 +4,8 @@ #include "media/base/fake_text_track_stream.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/single_thread_task_runner.h" diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index dde35d0..744ae2d 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc @@ -4,12 +4,16 @@ #include "media/base/key_systems.h" +#include <stddef.h> + #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/key_system_info.h" #include "media/base/key_systems_support_uma.h" #include "media/base/media_client.h" diff --git a/media/base/key_systems.h b/media/base/key_systems.h index 1c9c4da..dcdd254 100644 --- a/media/base/key_systems.h +++ b/media/base/key_systems.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_KEY_SYSTEMS_H_ #define MEDIA_BASE_KEY_SYSTEMS_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h index 47c31a9..0f2e2d3 100644 --- a/media/base/keyboard_event_counter.h +++ b/media/base/keyboard_event_counter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_KEYBOARD_EVENT_COUNTER_H_ #define MEDIA_BASE_KEYBOARD_EVENT_COUNTER_H_ +#include <stddef.h> + #include <set> #include "base/macros.h" diff --git a/media/base/mac/avfoundation_glue.h b/media/base/mac/avfoundation_glue.h index 0bfa334..bf79613 100644 --- a/media/base/mac/avfoundation_glue.h +++ b/media/base/mac/avfoundation_glue.h @@ -16,6 +16,8 @@ #import <Foundation/Foundation.h> #endif // defined(__OBJC__) +#include <stdint.h> + #include "base/macros.h" #include "media/base/mac/coremedia_glue.h" #include "media/base/media_export.h" diff --git a/media/base/mac/avfoundation_glue.mm b/media/base/mac/avfoundation_glue.mm index e1c9297..23f1177 100644 --- a/media/base/mac/avfoundation_glue.mm +++ b/media/base/mac/avfoundation_glue.mm @@ -5,10 +5,12 @@ #import "media/base/mac/avfoundation_glue.h" #include <dlfcn.h> +#include <stddef.h> #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/mac/mac_util.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/trace_event/trace_event.h" #include "media/base/media_switches.h" diff --git a/media/base/mac/coremedia_glue.h b/media/base/mac/coremedia_glue.h index fc05f35..9f69f96 100644 --- a/media/base/mac/coremedia_glue.h +++ b/media/base/mac/coremedia_glue.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ #include <CoreVideo/CoreVideo.h> +#include <stddef.h> #include <stdint.h> #include "base/macros.h" diff --git a/media/base/mac/coremedia_glue.mm b/media/base/mac/coremedia_glue.mm index a1c4f5c..23cfa09 100644 --- a/media/base/mac/coremedia_glue.mm +++ b/media/base/mac/coremedia_glue.mm @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" namespace { diff --git a/media/base/mac/video_frame_mac.cc b/media/base/mac/video_frame_mac.cc index b2b6485..0d48914 100644 --- a/media/base/mac/video_frame_mac.cc +++ b/media/base/mac/video_frame_mac.cc @@ -4,6 +4,9 @@ #include "media/base/mac/video_frame_mac.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "media/base/mac/corevideo_glue.h" diff --git a/media/base/mac/video_frame_mac_unittests.cc b/media/base/mac/video_frame_mac_unittests.cc index 77a1917..475d9aa 100644 --- a/media/base/mac/video_frame_mac_unittests.cc +++ b/media/base/mac/video_frame_mac_unittests.cc @@ -4,6 +4,8 @@ #include "media/base/mac/video_frame_mac.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" diff --git a/media/base/mac/videotoolbox_glue.h b/media/base/mac/videotoolbox_glue.h index 8acb8ca..212722a 100644 --- a/media/base/mac/videotoolbox_glue.h +++ b/media/base/mac/videotoolbox_glue.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_MAC_VIDEOTOOLBOX_GLUE_H_ #define MEDIA_BASE_MAC_VIDEOTOOLBOX_GLUE_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/mac/coremedia_glue.h" #include "media/base/media_export.h" diff --git a/media/base/mac/videotoolbox_glue.mm b/media/base/mac/videotoolbox_glue.mm index 18a4f00..010767c 100644 --- a/media/base/mac/videotoolbox_glue.mm +++ b/media/base/mac/videotoolbox_glue.mm @@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" // This class stores VideoToolbox library symbol pointers. diff --git a/media/base/media.cc b/media/base/media.cc index c3e1378..f55d1c4 100644 --- a/media/base/media.cc +++ b/media/base/media.cc @@ -6,6 +6,7 @@ #include "base/files/file_path.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/synchronization/lock.h" #include "base/trace_event/trace_event.h" diff --git a/media/base/media_file_checker.cc b/media/base/media_file_checker.cc index 7426d10..0482bc54 100644 --- a/media/base/media_file_checker.cc +++ b/media/base/media_file_checker.cc @@ -4,6 +4,9 @@ #include "media/base/media_file_checker.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/bind.h" diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 63ca4eb..bb34adf 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_MEDIA_KEYS_H_ #define MEDIA_BASE_MEDIA_KEYS_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/base/media_log.h b/media/base/media_log.h index 680ae3d..c547ef7 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_MEDIA_LOG_H_ #define MEDIA_BASE_MEDIA_LOG_H_ +#include <stddef.h> +#include <stdint.h> + #include <sstream> #include <string> diff --git a/media/base/media_log_event.h b/media/base/media_log_event.h index 44aab67..51933f3 100644 --- a/media/base/media_log_event.h +++ b/media/base/media_log_event.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_MEDIA_LOG_EVENT_H_ #define MEDIA_BASE_MEDIA_LOG_EVENT_H_ +#include <stdint.h> + #include "base/time/time.h" #include "base/values.h" diff --git a/media/base/media_resources.cc b/media/base/media_resources.cc index d7259e9..3a23632 100644 --- a/media/base/media_resources.cc +++ b/media/base/media_resources.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" namespace media { diff --git a/media/base/media_resources.h b/media/base/media_resources.h index 52053f7..5acb309 100644 --- a/media/base/media_resources.h +++ b/media/base/media_resources.h @@ -8,6 +8,7 @@ #include <string> #include "base/strings/string16.h" +#include "build/build_config.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 3c7686f..bc5d67f 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "media/base/media_switches.h" namespace switches { diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc index 7debd6c..5055c54 100644 --- a/media/base/mime_util.cc +++ b/media/base/mime_util.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc index 3592b02..8428032 100644 --- a/media/base/mime_util_unittest.cc +++ b/media/base/mime_util_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_split.h" #include "build/build_config.h" #include "media/base/mime_util.h" diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h index c558430..39c8f3b 100644 --- a/media/base/mock_filters.h +++ b/media/base/mock_filters.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_MOCK_FILTERS_H_ #define MEDIA_BASE_MOCK_FILTERS_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/base/moving_average.h b/media/base/moving_average.h index bb28653..d7e2357 100644 --- a/media/base/moving_average.h +++ b/media/base/moving_average.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_MOVING_AVERAGE_H_ #define MEDIA_BASE_MOVING_AVERAGE_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/base/multi_channel_resampler.h b/media/base/multi_channel_resampler.h index 84c50b9..dfe9f3b 100644 --- a/media/base/multi_channel_resampler.h +++ b/media/base/multi_channel_resampler.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_MULTI_CHANNEL_RESAMPLER_H_ #define MEDIA_BASE_MULTI_CHANNEL_RESAMPLER_H_ +#include <stddef.h> + #include <vector> #include "base/callback.h" diff --git a/media/base/multi_channel_resampler_unittest.cc b/media/base/multi_channel_resampler_unittest.cc index efaf0c5..2f77785 100644 --- a/media/base/multi_channel_resampler_unittest.cc +++ b/media/base/multi_channel_resampler_unittest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_bus.h" #include "media/base/multi_channel_resampler.h" diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc index 5d6e150..996edc0 100644 --- a/media/base/null_video_sink_unittest.cc +++ b/media/base/null_video_sink_unittest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/null_video_sink.h" diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h index 858d5a6..32e163c 100644 --- a/media/base/pipeline_status.h +++ b/media/base/pipeline_status.h @@ -7,6 +7,8 @@ #include "base/callback.h" +#include <stdint.h> + #include <string> namespace media { diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 6c0dfcf..a597aed 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/base/ranges.h b/media/base/ranges.h index 958df5c..ca6d035 100644 --- a/media/base/ranges.h +++ b/media/base/ranges.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_RANGES_H_ #define MEDIA_BASE_RANGES_H_ +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <ostream> #include <vector> diff --git a/media/base/ranges_unittest.cc b/media/base/ranges_unittest.cc index ad9f0d3..b76e7fe 100644 --- a/media/base/ranges_unittest.cc +++ b/media/base/ranges_unittest.cc @@ -4,6 +4,8 @@ #include "media/base/ranges.h" +#include <stddef.h> + #include <sstream> #include "base/strings/string_piece.h" diff --git a/media/base/seekable_buffer.h b/media/base/seekable_buffer.h index 91b68db..cfe31f2 100644 --- a/media/base/seekable_buffer.h +++ b/media/base/seekable_buffer.h @@ -33,6 +33,8 @@ #ifndef MEDIA_BASE_SEEKABLE_BUFFER_H_ #define MEDIA_BASE_SEEKABLE_BUFFER_H_ +#include <stdint.h> + #include <list> #include "base/macros.h" diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc index 7532a8e..acce11b 100644 --- a/media/base/seekable_buffer_unittest.cc +++ b/media/base/seekable_buffer_unittest.cc @@ -2,9 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <cstdlib> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/base/data_buffer.h" diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc index e2e8347..8d5d974 100644 --- a/media/base/serial_runner_unittest.cc +++ b/media/base/serial_runner_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/debug/stack_trace.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/pipeline_status.h" #include "media/base/serial_runner.h" diff --git a/media/base/simd/convert_rgb_to_yuv.h b/media/base/simd/convert_rgb_to_yuv.h index d3bb4ca..0634540 100644 --- a/media/base/simd/convert_rgb_to_yuv.h +++ b/media/base/simd/convert_rgb_to_yuv.h @@ -5,7 +5,8 @@ #ifndef MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_H_ #define MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "media/base/yuv_convert.h" namespace media { @@ -13,60 +14,60 @@ namespace media { // These methods are exported for testing purposes only. Library users should // only call the methods listed in yuv_convert.h. -MEDIA_EXPORT void ConvertRGB32ToYUV_SSSE3(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB32ToYUV_SSSE3(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB24ToYUV_SSSE3(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB24ToYUV_SSSE3(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2_Reference(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2_Reference(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB32ToYUV_C(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB32ToYUV_C(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB24ToYUV_C(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB24ToYUV_C(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, diff --git a/media/base/simd/convert_rgb_to_yuv_c.cc b/media/base/simd/convert_rgb_to_yuv_c.cc index 4917d37..a43e431 100644 --- a/media/base/simd/convert_rgb_to_yuv_c.cc +++ b/media/base/simd/convert_rgb_to_yuv_c.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "build/build_config.h" #include "media/base/simd/convert_rgb_to_yuv.h" namespace media { @@ -15,10 +18,10 @@ static int clip_byte(int x) { return x; } -void ConvertRGB32ToYUV_C(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB32ToYUV_C(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -37,7 +40,7 @@ void ConvertRGB32ToYUV_C(const uint8* rgbframe, for (int i = 0; i < height; ++i) { for (int j = 0; j < width; ++j) { // Since the input pixel format is RGB32, there are 4 bytes per pixel. - const uint8* pixel = rgbframe + 4 * j; + const uint8_t* pixel = rgbframe + 4 * j; yplane[j] = clip_byte(((pixel[r] * 66 + pixel[g] * 129 + pixel[b] * 25 + 128) >> 8) + 16); if (i % 2 == 0 && j % 2 == 0) { @@ -56,10 +59,10 @@ void ConvertRGB32ToYUV_C(const uint8* rgbframe, } } -void ConvertRGB24ToYUV_C(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB24ToYUV_C(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -68,7 +71,7 @@ void ConvertRGB24ToYUV_C(const uint8* rgbframe, for (int i = 0; i < height; ++i) { for (int j = 0; j < width; ++j) { // Since the input pixel format is RGB24, there are 3 bytes per pixel. - const uint8* pixel = rgbframe + 3 * j; + const uint8_t* pixel = rgbframe + 3 * j; yplane[j] = clip_byte(((pixel[2] * 66 + pixel[1] * 129 + pixel[0] * 25 + 128) >> 8) + 16); if (i % 2 == 0 && j % 2 == 0) { diff --git a/media/base/simd/convert_rgb_to_yuv_sse2.cc b/media/base/simd/convert_rgb_to_yuv_sse2.cc index 1b07598e..a8732f9 100644 --- a/media/base/simd/convert_rgb_to_yuv_sse2.cc +++ b/media/base/simd/convert_rgb_to_yuv_sse2.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "build/build_config.h" #include "media/base/simd/convert_rgb_to_yuv.h" @@ -24,27 +26,27 @@ namespace media { #define FIX(x) ((x) * (1 << FIX_SHIFT)) // Define a convenient macro to do static cast. -#define INT16_FIX(x) static_cast<int16>(FIX(x)) +#define INT16_FIX(x) static_cast<int16_t>(FIX(x)) // Android's pixel layout is RGBA, while other platforms // are BGRA. #if defined(OS_ANDROID) -SIMD_ALIGNED(const int16 ConvertRGBAToYUV_kTable[8 * 3]) = { - INT16_FIX(0.257), INT16_FIX(0.504), INT16_FIX(0.098), 0, - INT16_FIX(0.257), INT16_FIX(0.504), INT16_FIX(0.098), 0, - -INT16_FIX(0.148), -INT16_FIX(0.291), INT16_FIX(0.439), 0, - -INT16_FIX(0.148), -INT16_FIX(0.291), INT16_FIX(0.439), 0, - INT16_FIX(0.439), -INT16_FIX(0.368), -INT16_FIX(0.071), 0, - INT16_FIX(0.439), -INT16_FIX(0.368), -INT16_FIX(0.071), 0, +SIMD_ALIGNED(const int16_t ConvertRGBAToYUV_kTable[8 * 3]) = { + INT16_FIX(0.257), INT16_FIX(0.504), INT16_FIX(0.098), 0, + INT16_FIX(0.257), INT16_FIX(0.504), INT16_FIX(0.098), 0, + -INT16_FIX(0.148), -INT16_FIX(0.291), INT16_FIX(0.439), 0, + -INT16_FIX(0.148), -INT16_FIX(0.291), INT16_FIX(0.439), 0, + INT16_FIX(0.439), -INT16_FIX(0.368), -INT16_FIX(0.071), 0, + INT16_FIX(0.439), -INT16_FIX(0.368), -INT16_FIX(0.071), 0, }; #else -SIMD_ALIGNED(const int16 ConvertRGBAToYUV_kTable[8 * 3]) = { - INT16_FIX(0.098), INT16_FIX(0.504), INT16_FIX(0.257), 0, - INT16_FIX(0.098), INT16_FIX(0.504), INT16_FIX(0.257), 0, - INT16_FIX(0.439), -INT16_FIX(0.291), -INT16_FIX(0.148), 0, - INT16_FIX(0.439), -INT16_FIX(0.291), -INT16_FIX(0.148), 0, - -INT16_FIX(0.071), -INT16_FIX(0.368), INT16_FIX(0.439), 0, - -INT16_FIX(0.071), -INT16_FIX(0.368), INT16_FIX(0.439), 0, +SIMD_ALIGNED(const int16_t ConvertRGBAToYUV_kTable[8 * 3]) = { + INT16_FIX(0.098), INT16_FIX(0.504), INT16_FIX(0.257), 0, + INT16_FIX(0.098), INT16_FIX(0.504), INT16_FIX(0.257), 0, + INT16_FIX(0.439), -INT16_FIX(0.291), -INT16_FIX(0.148), 0, + INT16_FIX(0.439), -INT16_FIX(0.291), -INT16_FIX(0.148), 0, + -INT16_FIX(0.071), -INT16_FIX(0.368), INT16_FIX(0.439), 0, + -INT16_FIX(0.071), -INT16_FIX(0.368), INT16_FIX(0.439), 0, }; #endif @@ -53,17 +55,17 @@ SIMD_ALIGNED(const int16 ConvertRGBAToYUV_kTable[8 * 3]) = { // This is the final offset for the conversion from signed yuv values to // unsigned values. It is arranged so that offset of 16 is applied to Y // components and 128 is added to UV components for 2 pixels. -SIMD_ALIGNED(const int32 kYOffset[4]) = {16, 16, 16, 16}; +SIMD_ALIGNED(const int32_t kYOffset[4]) = {16, 16, 16, 16}; -static inline uint8 Clamp(int value) { +static inline uint8_t Clamp(int value) { if (value < 0) return 0; if (value > 255) return 255; - return static_cast<uint8>(value); + return static_cast<uint8_t>(value); } -static inline uint8 RGBToY(int r, int g, int b) { +static inline uint8_t RGBToY(int r, int g, int b) { int y = ConvertRGBAToYUV_kTable[0] * b + ConvertRGBAToYUV_kTable[1] * g + ConvertRGBAToYUV_kTable[2] * r; @@ -71,7 +73,7 @@ static inline uint8 RGBToY(int r, int g, int b) { return Clamp(y + 16); } -static inline uint8 RGBToU(int r, int g, int b, int shift) { +static inline uint8_t RGBToU(int r, int g, int b, int shift) { int u = ConvertRGBAToYUV_kTable[8] * b + ConvertRGBAToYUV_kTable[9] * g + ConvertRGBAToYUV_kTable[10] * r; @@ -79,7 +81,7 @@ static inline uint8 RGBToU(int r, int g, int b, int shift) { return Clamp(u + 128); } -static inline uint8 RGBToV(int r, int g, int b, int shift) { +static inline uint8_t RGBToV(int r, int g, int b, int shift) { int v = ConvertRGBAToYUV_kTable[16] * b + ConvertRGBAToYUV_kTable[17] * g + ConvertRGBAToYUV_kTable[18] * r; @@ -97,12 +99,12 @@ static inline uint8 RGBToV(int r, int g, int b, int shift) { sum_r += r; \ *y_buf++ = RGBToY(r, g, b); -static inline void ConvertRGBToYUV_V2H2(const uint8* rgb_buf_1, - const uint8* rgb_buf_2, - uint8* y_buf_1, - uint8* y_buf_2, - uint8* u_buf, - uint8* v_buf) { +static inline void ConvertRGBToYUV_V2H2(const uint8_t* rgb_buf_1, + const uint8_t* rgb_buf_2, + uint8_t* y_buf_1, + uint8_t* y_buf_2, + uint8_t* u_buf, + uint8_t* v_buf) { int sum_b = 0; int sum_g = 0; int sum_r = 0; @@ -118,12 +120,12 @@ static inline void ConvertRGBToYUV_V2H2(const uint8* rgb_buf_1, *v_buf++ = RGBToV(sum_r, sum_g, sum_b, 2); } -static inline void ConvertRGBToYUV_V2H1(const uint8* rgb_buf_1, - const uint8* rgb_buf_2, - uint8* y_buf_1, - uint8* y_buf_2, - uint8* u_buf, - uint8* v_buf) { +static inline void ConvertRGBToYUV_V2H1(const uint8_t* rgb_buf_1, + const uint8_t* rgb_buf_2, + uint8_t* y_buf_1, + uint8_t* y_buf_2, + uint8_t* u_buf, + uint8_t* v_buf) { int sum_b = 0; int sum_g = 0; int sum_r = 0; @@ -135,10 +137,10 @@ static inline void ConvertRGBToYUV_V2H1(const uint8* rgb_buf_1, *v_buf++ = RGBToV(sum_r, sum_g, sum_b, 1); } -static inline void ConvertRGBToYUV_V1H2(const uint8* rgb_buf, - uint8* y_buf, - uint8* u_buf, - uint8* v_buf) { +static inline void ConvertRGBToYUV_V1H2(const uint8_t* rgb_buf, + uint8_t* y_buf, + uint8_t* u_buf, + uint8_t* v_buf) { int sum_b = 0; int sum_g = 0; int sum_r = 0; @@ -150,10 +152,10 @@ static inline void ConvertRGBToYUV_V1H2(const uint8* rgb_buf, *v_buf++ = RGBToV(sum_r, sum_g, sum_b, 1); } -static inline void ConvertRGBToYUV_V1H1(const uint8* rgb_buf, - uint8* y_buf, - uint8* u_buf, - uint8* v_buf) { +static inline void ConvertRGBToYUV_V1H1(const uint8_t* rgb_buf, + uint8_t* y_buf, + uint8_t* u_buf, + uint8_t* v_buf) { int sum_b = 0; int sum_g = 0; int sum_r = 0; @@ -164,12 +166,12 @@ static inline void ConvertRGBToYUV_V1H1(const uint8* rgb_buf, *v_buf++ = RGBToV(r, g, b, 0); } -static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, - const uint8* rgb_buf_2, - uint8* y_buf_1, - uint8* y_buf_2, - uint8* u_buf, - uint8* v_buf, +static void ConvertRGB32ToYUVRow_SSE2(const uint8_t* rgb_buf_1, + const uint8_t* rgb_buf_2, + uint8_t* y_buf_1, + uint8_t* y_buf_2, + uint8_t* u_buf, + uint8_t* v_buf, int width) { while (width >= 4) { // Name for the Y pixels: @@ -213,7 +215,7 @@ static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, y_abcd = _mm_add_epi32(y_abcd, y_offset); y_abcd = _mm_packs_epi32(y_abcd, y_abcd); y_abcd = _mm_packus_epi16(y_abcd, y_abcd); - *reinterpret_cast<uint32*>(y_buf_1) = _mm_cvtsi128_si32(y_abcd); + *reinterpret_cast<uint32_t*>(y_buf_1) = _mm_cvtsi128_si32(y_abcd); y_buf_1 += 4; // Second row 4 pixels. @@ -246,7 +248,7 @@ static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, y_efgh = _mm_add_epi32(y_efgh, y_offset); y_efgh = _mm_packs_epi32(y_efgh, y_efgh); y_efgh = _mm_packus_epi16(y_efgh, y_efgh); - *reinterpret_cast<uint32*>(y_buf_2) = _mm_cvtsi128_si32(y_efgh); + *reinterpret_cast<uint32_t*>(y_buf_2) = _mm_cvtsi128_si32(y_efgh); y_buf_2 += 4; __m128i rgb_ae_cg = _mm_castps_si128( @@ -274,8 +276,8 @@ static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, u_a_b = _mm_add_epi32(u_a_b, uv_offset); u_a_b = _mm_packs_epi32(u_a_b, u_a_b); u_a_b = _mm_packus_epi16(u_a_b, u_a_b); - *reinterpret_cast<uint16*>(u_buf) = - static_cast<uint16>(_mm_extract_epi16(u_a_b, 0)); + *reinterpret_cast<uint16_t*>(u_buf) = + static_cast<uint16_t>(_mm_extract_epi16(u_a_b, 0)); u_buf += 2; __m128i v_a_b = _mm_madd_epi16( @@ -288,8 +290,8 @@ static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, v_a_b = _mm_add_epi32(v_a_b, uv_offset); v_a_b = _mm_packs_epi32(v_a_b, v_a_b); v_a_b = _mm_packus_epi16(v_a_b, v_a_b); - *reinterpret_cast<uint16*>(v_buf) = - static_cast<uint16>(_mm_extract_epi16(v_a_b, 0)); + *reinterpret_cast<uint16_t*>(v_buf) = + static_cast<uint16_t>(_mm_extract_epi16(v_a_b, 0)); v_buf += 2; rgb_buf_1 += 16; @@ -315,10 +317,10 @@ static void ConvertRGB32ToYUVRow_SSE2(const uint8* rgb_buf_1, ConvertRGBToYUV_V2H1(rgb_buf_1, rgb_buf_2, y_buf_1, y_buf_2, u_buf, v_buf); } -extern void ConvertRGB32ToYUV_SSE2(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +extern void ConvertRGB32ToYUV_SSE2(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -356,10 +358,10 @@ extern void ConvertRGB32ToYUV_SSE2(const uint8* rgbframe, ConvertRGBToYUV_V1H1(rgbframe, yplane, uplane, vplane); } -void ConvertRGB32ToYUV_SSE2_Reference(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB32ToYUV_SSE2_Reference(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, diff --git a/media/base/simd/convert_rgb_to_yuv_ssse3.asm b/media/base/simd/convert_rgb_to_yuv_ssse3.asm index ffbcbbc..6b86ff2 100644 --- a/media/base/simd/convert_rgb_to_yuv_ssse3.asm +++ b/media/base/simd/convert_rgb_to_yuv_ssse3.asm @@ -240,10 +240,10 @@ %endmacro ; -; extern "C" void ConvertARGBToYUVRow_SSSE3(const uint8* argb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertARGBToYUVRow_SSSE3(const uint8_t* argb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertARGBToYUVRow_SSSE3 @@ -253,10 +253,10 @@ %include "convert_rgb_to_yuv_ssse3.inc" ; -; extern "C" void ConvertRGBToYUVRow_SSSE3(const uint8* rgb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertRGBToYUVRow_SSSE3(const uint8_t* rgb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertRGBToYUVRow_SSSE3 @@ -266,10 +266,10 @@ %include "convert_rgb_to_yuv_ssse3.inc" ; -; extern "C" void ConvertARGBToYUVEven_SSSE3(const uint8* argb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertARGBToYUVEven_SSSE3(const uint8_t* argb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertARGBToYUVEven_SSSE3 @@ -279,10 +279,10 @@ %include "convert_rgb_to_yuv_ssse3.inc" ; -; extern "C" void ConvertARGBToYUVOdd_SSSE3(const uint8* argb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertARGBToYUVOdd_SSSE3(const uint8_t* argb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertARGBToYUVOdd_SSSE3 @@ -292,10 +292,10 @@ %include "convert_rgb_to_yuv_ssse3.inc" ; -; extern "C" void ConvertRGBToYUVEven_SSSE3(const uint8* rgb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertRGBToYUVEven_SSSE3(const uint8_t* rgb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertRGBToYUVEven_SSSE3 @@ -305,10 +305,10 @@ %include "convert_rgb_to_yuv_ssse3.inc" ; -; extern "C" void ConvertRGBToYUVOdd_SSSE3(const uint8* rgb, -; uint8* y, -; uint8* u, -; uint8* v, +; extern "C" void ConvertRGBToYUVOdd_SSSE3(const uint8_t* rgb, +; uint8_t* y, +; uint8_t* u, +; uint8_t* v, ; ptrdiff_t width); ; %define SYMBOL ConvertRGBToYUVOdd_SSSE3 diff --git a/media/base/simd/convert_rgb_to_yuv_ssse3.cc b/media/base/simd/convert_rgb_to_yuv_ssse3.cc index e956926..2ab2b98 100644 --- a/media/base/simd/convert_rgb_to_yuv_ssse3.cc +++ b/media/base/simd/convert_rgb_to_yuv_ssse3.cc @@ -9,10 +9,10 @@ namespace media { -void ConvertRGB32ToYUV_SSSE3(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB32ToYUV_SSSE3(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -35,10 +35,10 @@ void ConvertRGB32ToYUV_SSSE3(const uint8* rgbframe, ConvertARGBToYUVRow_SSSE3(rgbframe, yplane, uplane, vplane, width); } -void ConvertRGB24ToYUV_SSSE3(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB24ToYUV_SSSE3(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, diff --git a/media/base/simd/convert_rgb_to_yuv_ssse3.h b/media/base/simd/convert_rgb_to_yuv_ssse3.h index 92144c9..19ece73 100644 --- a/media/base/simd/convert_rgb_to_yuv_ssse3.h +++ b/media/base/simd/convert_rgb_to_yuv_ssse3.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_SSSE3_H_ #define MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_SSSE3_H_ +#include <stddef.h> +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif @@ -20,17 +23,17 @@ extern "C" { // issue on at least Win64. // Convert a row of 24-bit RGB pixels to YV12 pixels. -void ConvertRGBToYUVRow_SSSE3(const uint8* rgb, - uint8* y, - uint8* u, - uint8* v, +void ConvertRGBToYUVRow_SSSE3(const uint8_t* rgb, + uint8_t* y, + uint8_t* u, + uint8_t* v, ptrdiff_t width); // Convert a row of 32-bit RGB pixels to YV12 pixels. -void ConvertARGBToYUVRow_SSSE3(const uint8* argb, - uint8* y, - uint8* u, - uint8* v, +void ConvertARGBToYUVRow_SSSE3(const uint8_t* argb, + uint8_t* y, + uint8_t* u, + uint8_t* v, ptrdiff_t width); #ifdef __cplusplus diff --git a/media/base/simd/convert_rgb_to_yuv_ssse3.inc b/media/base/simd/convert_rgb_to_yuv_ssse3.inc index e49e922..5217c69 100644 --- a/media/base/simd/convert_rgb_to_yuv_ssse3.inc +++ b/media/base/simd/convert_rgb_to_yuv_ssse3.inc @@ -3,7 +3,7 @@ ; found in the LICENSE file. ; -; void SYMBOL(const uint8* argb, uint8* y, uint8* u, uint8* v, int width); +; void SYMBOL(const uint8_t* argb, uint8_t* y, uint8_t* u, uint8_t* v, int width); ; ; The main code that converts RGB pixels to YUV pixels. This function roughly ; consists of three parts: converting one ARGB pixel to YUV pixels, converting diff --git a/media/base/simd/convert_rgb_to_yuv_unittest.cc b/media/base/simd/convert_rgb_to_yuv_unittest.cc index fc88795..b5ea88d 100644 --- a/media/base/simd/convert_rgb_to_yuv_unittest.cc +++ b/media/base/simd/convert_rgb_to_yuv_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/cpu.h" #include "base/memory/scoped_ptr.h" #include "media/base/simd/convert_rgb_to_yuv.h" @@ -10,19 +12,19 @@ namespace { // Reference code that converts RGB pixels to YUV pixels. -int ConvertRGBToY(const uint8* rgb) { +int ConvertRGBToY(const uint8_t* rgb) { int y = 25 * rgb[0] + 129 * rgb[1] + 66 * rgb[2]; y = ((y + 128) >> 8) + 16; return std::max(0, std::min(255, y)); } -int ConvertRGBToU(const uint8* rgb, int size) { +int ConvertRGBToU(const uint8_t* rgb, int size) { int u = 112 * rgb[0] - 74 * rgb[1] - 38 * rgb[2]; u = ((u + 128) >> 8) + 128; return std::max(0, std::min(255, u)); } -int ConvertRGBToV(const uint8* rgb, int size) { +int ConvertRGBToV(const uint8_t* rgb, int size) { int v = -18 * rgb[0] - 94 * rgb[1] + 112 * rgb[2]; v = ((v + 128) >> 8) + 128; return std::max(0, std::min(255, v)); @@ -56,14 +58,14 @@ TEST(YUVConvertTest, MAYBE_SideBySideRGB) { for (int size = 3; size <= 4; ++size) { // Create the output buffers. - scoped_ptr<uint8[]> rgb(new uint8[kWidth * size]); - scoped_ptr<uint8[]> y(new uint8[kWidth]); - scoped_ptr<uint8[]> u(new uint8[kWidth / 2]); - scoped_ptr<uint8[]> v(new uint8[kWidth / 2]); + scoped_ptr<uint8_t[]> rgb(new uint8_t[kWidth * size]); + scoped_ptr<uint8_t[]> y(new uint8_t[kWidth]); + scoped_ptr<uint8_t[]> u(new uint8_t[kWidth / 2]); + scoped_ptr<uint8_t[]> v(new uint8_t[kWidth / 2]); // Choose the function that converts from RGB pixels to YUV ones. - void (*convert)(const uint8*, uint8*, uint8*, uint8*, - int, int, int, int, int) = NULL; + void (*convert)(const uint8_t*, uint8_t*, uint8_t*, uint8_t*, int, int, int, + int, int) = NULL; if (size == 3) convert = media::ConvertRGB24ToYUV_SSSE3; else @@ -88,21 +90,21 @@ TEST(YUVConvertTest, MAYBE_SideBySideRGB) { // Check the output Y pixels. for (int i = 0; i < kWidth; ++i) { - const uint8* p = &rgb[i * size]; + const uint8_t* p = &rgb[i * size]; int error = ConvertRGBToY(p) - y[i]; total_error += error > 0 ? error : -error; } // Check the output U pixels. for (int i = 0; i < kWidth / 2; ++i) { - const uint8* p = &rgb[i * 2 * size]; + const uint8_t* p = &rgb[i * 2 * size]; int error = ConvertRGBToU(p, size) - u[i]; total_error += error > 0 ? error : -error; } // Check the output V pixels. for (int i = 0; i < kWidth / 2; ++i) { - const uint8* p = &rgb[i * 2 * size]; + const uint8_t* p = &rgb[i * 2 * size]; int error = ConvertRGBToV(p, size) - v[i]; total_error += error > 0 ? error : -error; } diff --git a/media/base/simd/convert_yuv_to_rgb.h b/media/base/simd/convert_yuv_to_rgb.h index 7feb007..a421ff5 100644 --- a/media/base/simd/convert_yuv_to_rgb.h +++ b/media/base/simd/convert_yuv_to_rgb.h @@ -5,7 +5,9 @@ #ifndef MEDIA_BASE_SIMD_CONVERT_YUV_TO_RGB_H_ #define MEDIA_BASE_SIMD_CONVERT_YUV_TO_RGB_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "media/base/yuv_convert.h" namespace media { @@ -13,10 +15,10 @@ namespace media { // These methods are exported for testing purposes only. Library users should // only call the methods listed in yuv_convert.h. -MEDIA_EXPORT void ConvertYUVToRGB32_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVToRGB32_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -24,18 +26,18 @@ MEDIA_EXPORT void ConvertYUVToRGB32_C(const uint8* yplane, int rgbstride, YUVType yuv_type); -MEDIA_EXPORT void ConvertYUVToRGB32Row_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVToRGB32Row_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, ptrdiff_t width, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void ConvertYUVAToARGB_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVAToARGB_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -44,18 +46,18 @@ MEDIA_EXPORT void ConvertYUVAToARGB_C(const uint8* yplane, int rgbstride, YUVType yuv_type); -MEDIA_EXPORT void ConvertYUVAToARGBRow_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVAToARGBRow_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, ptrdiff_t width, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void ConvertYUVToRGB32_SSE(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVToRGB32_SSE(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -63,11 +65,11 @@ MEDIA_EXPORT void ConvertYUVToRGB32_SSE(const uint8* yplane, int rgbstride, YUVType yuv_type); -MEDIA_EXPORT void ConvertYUVAToARGB_MMX(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVAToARGB_MMX(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -76,31 +78,31 @@ MEDIA_EXPORT void ConvertYUVAToARGB_MMX(const uint8* yplane, int rgbstride, YUVType yuv_type); -MEDIA_EXPORT void ScaleYUVToRGB32Row_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +MEDIA_EXPORT void ScaleYUVToRGB32Row_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void LinearScaleYUVToRGB32Row_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +MEDIA_EXPORT void LinearScaleYUVToRGB32Row_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table); + const int16_t* convert_table); MEDIA_EXPORT void LinearScaleYUVToRGB32RowWithRange_C( - const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, + const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, int dest_width, int source_x, int source_dx, - const int16* convert_table); + const int16_t* convert_table); } // namespace media @@ -114,52 +116,53 @@ extern "C" { // issue on at least Win64. The C-equivalent RowProc versions' prototypes // include the same change to ptrdiff_t to reuse the typedefs. -MEDIA_EXPORT void ConvertYUVAToARGBRow_MMX(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVAToARGBRow_MMX(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, ptrdiff_t width, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void ConvertYUVToRGB32Row_SSE(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVToRGB32Row_SSE(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, ptrdiff_t width, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void ScaleYUVToRGB32Row_SSE(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +MEDIA_EXPORT void ScaleYUVToRGB32Row_SSE(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void ScaleYUVToRGB32Row_SSE2_X64(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +MEDIA_EXPORT void ScaleYUVToRGB32Row_SSE2_X64(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table); + const int16_t* convert_table); -MEDIA_EXPORT void LinearScaleYUVToRGB32Row_SSE(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +MEDIA_EXPORT void LinearScaleYUVToRGB32Row_SSE(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table); - -MEDIA_EXPORT void LinearScaleYUVToRGB32Row_MMX_X64(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, - ptrdiff_t width, - ptrdiff_t source_dx, - const int16* convert_table); + const int16_t* convert_table); + +MEDIA_EXPORT void LinearScaleYUVToRGB32Row_MMX_X64( + const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, + ptrdiff_t width, + ptrdiff_t source_dx, + const int16_t* convert_table); } // extern "C" diff --git a/media/base/simd/convert_yuv_to_rgb_c.cc b/media/base/simd/convert_yuv_to_rgb_c.cc index 370f80e..f4345df 100644 --- a/media/base/simd/convert_yuv_to_rgb_c.cc +++ b/media/base/simd/convert_yuv_to_rgb_c.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "build/build_config.h" #include "media/base/simd/convert_yuv_to_rgb.h" namespace media { @@ -34,11 +38,11 @@ namespace media { #define A_INDEX 3 #endif -static inline void ConvertYUVToRGB32_C(uint8 y, - uint8 u, - uint8 v, - uint8* rgb_buf, - const int16* convert_table) { +static inline void ConvertYUVToRGB32_C(uint8_t y, + uint8_t u, + uint8_t v, + uint8_t* rgb_buf, + const int16_t* convert_table) { int b = convert_table[4 * (256 + u) + B_INDEX]; int g = convert_table[4 * (256 + u) + G_INDEX]; int r = convert_table[4 * (256 + u) + R_INDEX]; @@ -59,18 +63,17 @@ static inline void ConvertYUVToRGB32_C(uint8 y, r >>= 6; a >>= 6; - *reinterpret_cast<uint32*>(rgb_buf) = (packuswb(b) << SK_B32_SHIFT) | - (packuswb(g) << SK_G32_SHIFT) | - (packuswb(r) << SK_R32_SHIFT) | - (packuswb(a) << SK_A32_SHIFT); + *reinterpret_cast<uint32_t*>(rgb_buf) = + (packuswb(b) << SK_B32_SHIFT) | (packuswb(g) << SK_G32_SHIFT) | + (packuswb(r) << SK_R32_SHIFT) | (packuswb(a) << SK_A32_SHIFT); } -static inline void ConvertYUVAToARGB_C(uint8 y, - uint8 u, - uint8 v, - uint8 a, - uint8* rgb_buf, - const int16* convert_table) { +static inline void ConvertYUVAToARGB_C(uint8_t y, + uint8_t u, + uint8_t v, + uint8_t a, + uint8_t* rgb_buf, + const int16_t* convert_table) { int b = convert_table[4 * (256 + u) + 0]; int g = convert_table[4 * (256 + u) + 1]; int r = convert_table[4 * (256 + u) + 2]; @@ -91,47 +94,46 @@ static inline void ConvertYUVAToARGB_C(uint8 y, g = packuswb(g) * a >> 8; r = packuswb(r) * a >> 8; - *reinterpret_cast<uint32*>(rgb_buf) = (b << SK_B32_SHIFT) | - (g << SK_G32_SHIFT) | - (r << SK_R32_SHIFT) | - (a << SK_A32_SHIFT); + *reinterpret_cast<uint32_t*>(rgb_buf) = + (b << SK_B32_SHIFT) | (g << SK_G32_SHIFT) | (r << SK_R32_SHIFT) | + (a << SK_A32_SHIFT); } -void ConvertYUVToRGB32Row_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void ConvertYUVToRGB32Row_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, - const int16* convert_table) { + const int16_t* convert_table) { for (int x = 0; x < width; x += 2) { - uint8 u = u_buf[x >> 1]; - uint8 v = v_buf[x >> 1]; - uint8 y0 = y_buf[x]; + uint8_t u = u_buf[x >> 1]; + uint8_t v = v_buf[x >> 1]; + uint8_t y0 = y_buf[x]; ConvertYUVToRGB32_C(y0, u, v, rgb_buf, convert_table); if ((x + 1) < width) { - uint8 y1 = y_buf[x + 1]; + uint8_t y1 = y_buf[x + 1]; ConvertYUVToRGB32_C(y1, u, v, rgb_buf + 4, convert_table); } rgb_buf += 8; // Advance 2 pixels. } } -void ConvertYUVAToARGBRow_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - const uint8* a_buf, - uint8* rgba_buf, +void ConvertYUVAToARGBRow_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + const uint8_t* a_buf, + uint8_t* rgba_buf, ptrdiff_t width, - const int16* convert_table) { + const int16_t* convert_table) { for (int x = 0; x < width; x += 2) { - uint8 u = u_buf[x >> 1]; - uint8 v = v_buf[x >> 1]; - uint8 y0 = y_buf[x]; - uint8 a0 = a_buf[x]; + uint8_t u = u_buf[x >> 1]; + uint8_t v = v_buf[x >> 1]; + uint8_t y0 = y_buf[x]; + uint8_t a0 = a_buf[x]; ConvertYUVAToARGB_C(y0, u, v, a0, rgba_buf, convert_table); if ((x + 1) < width) { - uint8 y1 = y_buf[x + 1]; - uint8 a1 = a_buf[x + 1]; + uint8_t y1 = y_buf[x + 1]; + uint8_t a1 = a_buf[x + 1]; ConvertYUVAToARGB_C(y1, u, v, a1, rgba_buf + 4, convert_table); } rgba_buf += 8; // Advance 2 pixels. @@ -142,13 +144,13 @@ void ConvertYUVAToARGBRow_C(const uint8* y_buf, // A shift by 17 is used to further subsample the chrominence channels. // & 0xffff isolates the fixed point fraction. >> 2 to get the upper 2 bits, // for 1/65536 pixel accurate interpolation. -void ScaleYUVToRGB32Row_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void ScaleYUVToRGB32Row_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table) { + const int16_t* convert_table) { int x = 0; for (int i = 0; i < width; i += 2) { int y = y_buf[x >> 16]; @@ -165,13 +167,13 @@ void ScaleYUVToRGB32Row_C(const uint8* y_buf, } } -void LinearScaleYUVToRGB32Row_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void LinearScaleYUVToRGB32Row_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, ptrdiff_t width, ptrdiff_t source_dx, - const int16* convert_table) { + const int16_t* convert_table) { // Avoid point-sampling for down-scaling by > 2:1. int source_x = 0; if (source_dx >= 0x20000) @@ -180,14 +182,14 @@ void LinearScaleYUVToRGB32Row_C(const uint8* y_buf, source_x, source_dx, convert_table); } -void LinearScaleYUVToRGB32RowWithRange_C(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void LinearScaleYUVToRGB32RowWithRange_C(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, int dest_width, int x, int source_dx, - const int16* convert_table) { + const int16_t* convert_table) { for (int i = 0; i < dest_width; i += 2) { int y0 = y_buf[x >> 16]; int y1 = y_buf[(x >> 16) + 1]; @@ -214,10 +216,10 @@ void LinearScaleYUVToRGB32RowWithRange_C(const uint8* y_buf, } } -void ConvertYUVToRGB32_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +void ConvertYUVToRGB32_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -225,12 +227,12 @@ void ConvertYUVToRGB32_C(const uint8* yplane, int rgbstride, YUVType yuv_type) { unsigned int y_shift = GetVerticalShift(yuv_type); - const int16* lookup_table = GetLookupTable(yuv_type); + const int16_t* lookup_table = GetLookupTable(yuv_type); for (int y = 0; y < height; ++y) { - uint8* rgb_row = rgbframe + y * rgbstride; - const uint8* y_ptr = yplane + y * ystride; - const uint8* u_ptr = uplane + (y >> y_shift) * uvstride; - const uint8* v_ptr = vplane + (y >> y_shift) * uvstride; + uint8_t* rgb_row = rgbframe + y * rgbstride; + const uint8_t* y_ptr = yplane + y * ystride; + const uint8_t* u_ptr = uplane + (y >> y_shift) * uvstride; + const uint8_t* v_ptr = vplane + (y >> y_shift) * uvstride; ConvertYUVToRGB32Row_C(y_ptr, u_ptr, @@ -241,11 +243,11 @@ void ConvertYUVToRGB32_C(const uint8* yplane, } } -void ConvertYUVAToARGB_C(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbaframe, +void ConvertYUVAToARGB_C(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbaframe, int width, int height, int ystride, @@ -254,13 +256,13 @@ void ConvertYUVAToARGB_C(const uint8* yplane, int rgbastride, YUVType yuv_type) { unsigned int y_shift = GetVerticalShift(yuv_type); - const int16* lookup_table = GetLookupTable(yuv_type); + const int16_t* lookup_table = GetLookupTable(yuv_type); for (int y = 0; y < height; y++) { - uint8* rgba_row = rgbaframe + y * rgbastride; - const uint8* y_ptr = yplane + y * ystride; - const uint8* u_ptr = uplane + (y >> y_shift) * uvstride; - const uint8* v_ptr = vplane + (y >> y_shift) * uvstride; - const uint8* a_ptr = aplane + y * astride; + uint8_t* rgba_row = rgbaframe + y * rgbastride; + const uint8_t* y_ptr = yplane + y * ystride; + const uint8_t* u_ptr = uplane + (y >> y_shift) * uvstride; + const uint8_t* v_ptr = vplane + (y >> y_shift) * uvstride; + const uint8_t* a_ptr = aplane + y * astride; ConvertYUVAToARGBRow_C(y_ptr, u_ptr, diff --git a/media/base/simd/convert_yuv_to_rgb_sse.asm b/media/base/simd/convert_yuv_to_rgb_sse.asm index 890c292..f666243 100644 --- a/media/base/simd/convert_yuv_to_rgb_sse.asm +++ b/media/base/simd/convert_yuv_to_rgb_sse.asm @@ -14,11 +14,11 @@ %define MOVQ movntq ; -; extern "C" void ConvertYUVToRGB32Row_SSE(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; extern "C" void ConvertYUVToRGB32Row_SSE(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width); -; const int16* convert_table); +; const int16_t* convert_table); %define SYMBOL ConvertYUVToRGB32Row_SSE %include "convert_yuv_to_rgb_mmx.inc" diff --git a/media/base/simd/convert_yuv_to_rgb_x86.cc b/media/base/simd/convert_yuv_to_rgb_x86.cc index 043170a..a06799b 100644 --- a/media/base/simd/convert_yuv_to_rgb_x86.cc +++ b/media/base/simd/convert_yuv_to_rgb_x86.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #if defined(_MSC_VER) #include <intrin.h> #else @@ -13,11 +15,11 @@ namespace media { -void ConvertYUVAToARGB_MMX(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +void ConvertYUVAToARGB_MMX(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -27,11 +29,11 @@ void ConvertYUVAToARGB_MMX(const uint8* yplane, YUVType yuv_type) { unsigned int y_shift = GetVerticalShift(yuv_type); for (int y = 0; y < height; ++y) { - uint8* rgb_row = rgbframe + y * rgbstride; - const uint8* y_ptr = yplane + y * ystride; - const uint8* u_ptr = uplane + (y >> y_shift) * uvstride; - const uint8* v_ptr = vplane + (y >> y_shift) * uvstride; - const uint8* a_ptr = aplane + y * astride; + uint8_t* rgb_row = rgbframe + y * rgbstride; + const uint8_t* y_ptr = yplane + y * ystride; + const uint8_t* u_ptr = uplane + (y >> y_shift) * uvstride; + const uint8_t* v_ptr = vplane + (y >> y_shift) * uvstride; + const uint8_t* a_ptr = aplane + y * astride; ConvertYUVAToARGBRow_MMX(y_ptr, u_ptr, @@ -45,10 +47,10 @@ void ConvertYUVAToARGB_MMX(const uint8* yplane, EmptyRegisterState(); } -void ConvertYUVToRGB32_SSE(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +void ConvertYUVToRGB32_SSE(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -57,10 +59,10 @@ void ConvertYUVToRGB32_SSE(const uint8* yplane, YUVType yuv_type) { unsigned int y_shift = GetVerticalShift(yuv_type); for (int y = 0; y < height; ++y) { - uint8* rgb_row = rgbframe + y * rgbstride; - const uint8* y_ptr = yplane + y * ystride; - const uint8* u_ptr = uplane + (y >> y_shift) * uvstride; - const uint8* v_ptr = vplane + (y >> y_shift) * uvstride; + uint8_t* rgb_row = rgbframe + y * rgbstride; + const uint8_t* y_ptr = yplane + y * ystride; + const uint8_t* u_ptr = uplane + (y >> y_shift) * uvstride; + const uint8_t* v_ptr = vplane + (y >> y_shift) * uvstride; ConvertYUVToRGB32Row_SSE(y_ptr, u_ptr, diff --git a/media/base/simd/convert_yuva_to_argb_mmx.asm b/media/base/simd/convert_yuva_to_argb_mmx.asm index 5c263d5..28a147e 100644 --- a/media/base/simd/convert_yuva_to_argb_mmx.asm +++ b/media/base/simd/convert_yuva_to_argb_mmx.asm @@ -13,12 +13,12 @@ ; Use movq to save the output. %define MOVQ movq -; extern "C" void ConvertYUVAToARGBRow_MMX(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; const uint8* a_buf, -; uint8* rgb_buf, +; extern "C" void ConvertYUVAToARGBRow_MMX(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; const uint8_t* a_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width); -; const int16* convert_table); +; const int16_t* convert_table); %define SYMBOL ConvertYUVAToARGBRow_MMX %include "convert_yuva_to_argb_mmx.inc" diff --git a/media/base/simd/filter_yuv.h b/media/base/simd/filter_yuv.h index 41851bc..af30bd1 100644 --- a/media/base/simd/filter_yuv.h +++ b/media/base/simd/filter_yuv.h @@ -5,7 +5,8 @@ #ifndef MEDIA_BASE_SIMD_FILTER_YUV_H_ #define MEDIA_BASE_SIMD_FILTER_YUV_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "media/base/media_export.h" namespace media { @@ -13,17 +14,17 @@ namespace media { // These methods are exported for testing purposes only. Library users should // only call the methods listed in yuv_convert.h. -MEDIA_EXPORT void FilterYUVRows_C(uint8* ybuf, - const uint8* y0_ptr, - const uint8* y1_ptr, +MEDIA_EXPORT void FilterYUVRows_C(uint8_t* ybuf, + const uint8_t* y0_ptr, + const uint8_t* y1_ptr, int source_width, - uint8 source_y_fraction); + uint8_t source_y_fraction); -MEDIA_EXPORT void FilterYUVRows_SSE2(uint8* ybuf, - const uint8* y0_ptr, - const uint8* y1_ptr, +MEDIA_EXPORT void FilterYUVRows_SSE2(uint8_t* ybuf, + const uint8_t* y0_ptr, + const uint8_t* y1_ptr, int source_width, - uint8 source_y_fraction); + uint8_t source_y_fraction); } // namespace media diff --git a/media/base/simd/filter_yuv_c.cc b/media/base/simd/filter_yuv_c.cc index 3411208..7f60676 100644 --- a/media/base/simd/filter_yuv_c.cc +++ b/media/base/simd/filter_yuv_c.cc @@ -2,16 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/base/simd/filter_yuv.h" namespace media { -void FilterYUVRows_C(uint8* ybuf, const uint8* y0_ptr, const uint8* y1_ptr, - int source_width, uint8 source_y_fraction) { - uint8 y1_fraction = source_y_fraction; - uint16 y0_fraction = 256 - y1_fraction; - uint8* end = ybuf + source_width; - uint8* rounded_end = ybuf + (source_width & ~7); +void FilterYUVRows_C(uint8_t* ybuf, + const uint8_t* y0_ptr, + const uint8_t* y1_ptr, + int source_width, + uint8_t source_y_fraction) { + uint8_t y1_fraction = source_y_fraction; + uint16_t y0_fraction = 256 - y1_fraction; + uint8_t* end = ybuf + source_width; + uint8_t* rounded_end = ybuf + (source_width & ~7); while (ybuf < rounded_end) { ybuf[0] = (y0_ptr[0] * y0_fraction + y1_ptr[0] * y1_fraction) >> 8; diff --git a/media/base/simd/filter_yuv_sse2.cc b/media/base/simd/filter_yuv_sse2.cc index b30f8d7..85ee5a7 100644 --- a/media/base/simd/filter_yuv_sse2.cc +++ b/media/base/simd/filter_yuv_sse2.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #if defined(_MSC_VER) #include <intrin.h> #else @@ -13,11 +15,11 @@ namespace media { -void FilterYUVRows_SSE2(uint8* dest, - const uint8* src0, - const uint8* src1, +void FilterYUVRows_SSE2(uint8_t* dest, + const uint8_t* src0, + const uint8_t* src1, int width, - uint8 fraction) { + uint8_t fraction) { int pixel = 0; // Process the unaligned bytes first. diff --git a/media/base/simd/linear_scale_yuv_to_rgb_mmx.asm b/media/base/simd/linear_scale_yuv_to_rgb_mmx.asm index a85a932..f2e4f95 100644 --- a/media/base/simd/linear_scale_yuv_to_rgb_mmx.asm +++ b/media/base/simd/linear_scale_yuv_to_rgb_mmx.asm @@ -13,12 +13,12 @@ ; Use movq to save the output. %define MOVQ movq -; void LinearScaleYUVToRGB32Row_MMX(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; void LinearScaleYUVToRGB32Row_MMX(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); -; const int16* convert_table); +; const int16_t* convert_table); %define SYMBOL LinearScaleYUVToRGB32Row_MMX %include "linear_scale_yuv_to_rgb_mmx.inc" diff --git a/media/base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm b/media/base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm index 03213f2..969a1fd 100644 --- a/media/base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm +++ b/media/base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm @@ -11,10 +11,10 @@ SECTION_TEXT CPU MMX -;void LinearScaleYUVToRGB32Row_MMX_X64(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +;void LinearScaleYUVToRGB32Row_MMX_X64(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); %define SYMBOL LinearScaleYUVToRGB32Row_MMX_X64 diff --git a/media/base/simd/linear_scale_yuv_to_rgb_sse.asm b/media/base/simd/linear_scale_yuv_to_rgb_sse.asm index 0d6685f..62ee9ac 100644 --- a/media/base/simd/linear_scale_yuv_to_rgb_sse.asm +++ b/media/base/simd/linear_scale_yuv_to_rgb_sse.asm @@ -13,10 +13,10 @@ ; Use movq to save the output. %define MOVQ movntq -; void LinearScaleYUVToRGB32Row_SSE(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; void LinearScaleYUVToRGB32Row_SSE(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); %define SYMBOL LinearScaleYUVToRGB32Row_SSE diff --git a/media/base/simd/scale_yuv_to_rgb_mmx.asm b/media/base/simd/scale_yuv_to_rgb_mmx.asm index d6b82f2..b21c12c 100644 --- a/media/base/simd/scale_yuv_to_rgb_mmx.asm +++ b/media/base/simd/scale_yuv_to_rgb_mmx.asm @@ -13,12 +13,12 @@ ; Use movq to save the output. %define MOVQ movq -; void ScaleYUVToRGB32Row_MMX(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; void ScaleYUVToRGB32Row_MMX(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); -; const int16* convert_table); +; const int16_t* convert_table); %define SYMBOL ScaleYUVToRGB32Row_MMX %include "scale_yuv_to_rgb_mmx.inc" diff --git a/media/base/simd/scale_yuv_to_rgb_sse.asm b/media/base/simd/scale_yuv_to_rgb_sse.asm index 06ba6c2..34e0112 100644 --- a/media/base/simd/scale_yuv_to_rgb_sse.asm +++ b/media/base/simd/scale_yuv_to_rgb_sse.asm @@ -13,12 +13,12 @@ ; Use movq to save the output. %define MOVQ movntq -; void ScaleYUVToRGB32Row_SSE(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; void ScaleYUVToRGB32Row_SSE(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); -; const int16* convert_table); +; const int16_t* convert_table); %define SYMBOL ScaleYUVToRGB32Row_SSE %include "scale_yuv_to_rgb_mmx.inc" diff --git a/media/base/simd/scale_yuv_to_rgb_sse2_x64.asm b/media/base/simd/scale_yuv_to_rgb_sse2_x64.asm index 8f7345c..9c52b8dc 100644 --- a/media/base/simd/scale_yuv_to_rgb_sse2_x64.asm +++ b/media/base/simd/scale_yuv_to_rgb_sse2_x64.asm @@ -11,10 +11,10 @@ SECTION_TEXT CPU SSE2 -; void ScaleYUVToRGB32Row_SSE2_X64(const uint8* y_buf, -; const uint8* u_buf, -; const uint8* v_buf, -; uint8* rgb_buf, +; void ScaleYUVToRGB32Row_SSE2_X64(const uint8_t* y_buf, +; const uint8_t* u_buf, +; const uint8_t* v_buf, +; uint8_t* rgb_buf, ; ptrdiff_t width, ; ptrdiff_t source_dx); %define SYMBOL ScaleYUVToRGB32Row_SSE2_X64 diff --git a/media/base/sinc_resampler.cc b/media/base/sinc_resampler.cc index fa2cf94..ec35b74 100644 --- a/media/base/sinc_resampler.cc +++ b/media/base/sinc_resampler.cc @@ -82,6 +82,7 @@ #include <limits> #include "base/logging.h" +#include "build/build_config.h" #if defined(ARCH_CPU_X86_FAMILY) #include <xmmintrin.h> diff --git a/media/base/sinc_resampler_perftest.cc b/media/base/sinc_resampler_perftest.cc index 5ee3348..9cb7f4f 100644 --- a/media/base/sinc_resampler_perftest.cc +++ b/media/base/sinc_resampler_perftest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/sinc_resampler.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/sinc_resampler_unittest.cc b/media/base/sinc_resampler_unittest.cc index f3f45c4..37e2649 100644 --- a/media/base/sinc_resampler_unittest.cc +++ b/media/base/sinc_resampler_unittest.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h index 1db22dd..27ebc3f 100644 --- a/media/base/stream_parser.h +++ b/media/base/stream_parser.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_STREAM_PARSER_H_ #define MEDIA_BASE_STREAM_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <map> #include <string> diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h index 26f5742..74649ae 100644 --- a/media/base/stream_parser_buffer.h +++ b/media/base/stream_parser_buffer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_STREAM_PARSER_BUFFER_H_ #define MEDIA_BASE_STREAM_PARSER_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include "base/macros.h" diff --git a/media/base/stream_parser_unittest.cc b/media/base/stream_parser_unittest.cc index 927c60f..4aa9617 100644 --- a/media/base/stream_parser_unittest.cc +++ b/media/base/stream_parser_unittest.cc @@ -2,9 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <sstream> +#include "base/macros.h" #include "media/base/stream_parser.h" #include "media/base/stream_parser_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc index 2278b81..c56fd42 100644 --- a/media/base/test_data_util.cc +++ b/media/base/test_data_util.cc @@ -4,6 +4,8 @@ #include "media/base/test_data_util.h" +#include <stdint.h> + #include "base/files/file_util.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc index c4964b1..1c2fb8b 100644 --- a/media/base/test_helpers.cc +++ b/media/base/test_helpers.cc @@ -4,8 +4,11 @@ #include "media/base/test_helpers.h" +#include <stdint.h> + #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/pickle.h" #include "base/run_loop.h" diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index 293e517..2145264 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_TEST_HELPERS_H_ #define MEDIA_BASE_TEST_HELPERS_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "media/base/channel_layout.h" diff --git a/media/base/text_ranges.h b/media/base/text_ranges.h index adb1750..2b75822 100644 --- a/media/base/text_ranges.h +++ b/media/base/text_ranges.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_TEXT_RANGES_H_ #define MEDIA_BASE_TEXT_RANGES_H_ +#include <stddef.h> + #include <map> #include "base/macros.h" diff --git a/media/base/text_ranges_unittest.cc b/media/base/text_ranges_unittest.cc index 7de0514..69cf2e3 100644 --- a/media/base/text_ranges_unittest.cc +++ b/media/base/text_ranges_unittest.cc @@ -4,6 +4,8 @@ #include "media/base/text_ranges.h" +#include <stddef.h> + #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc index 3648f8a..da0e6f3 100644 --- a/media/base/text_renderer.cc +++ b/media/base/text_renderer.cc @@ -4,6 +4,8 @@ #include "media/base/text_renderer.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc index 56074ee..9d669ae 100644 --- a/media/base/text_renderer_unittest.cc +++ b/media/base/text_renderer_unittest.cc @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "media/base/audio_decoder_config.h" diff --git a/media/base/time_delta_interpolator.cc b/media/base/time_delta_interpolator.cc index a361b35..aea174c 100644 --- a/media/base/time_delta_interpolator.cc +++ b/media/base/time_delta_interpolator.cc @@ -4,6 +4,8 @@ #include "media/base/time_delta_interpolator.h" +#include <stdint.h> + #include <algorithm> #include "base/logging.h" diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h index 574d695..0b06c7e 100644 --- a/media/base/user_input_monitor.h +++ b/media/base/user_input_monitor.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_USER_INPUT_MONITOR_H_ #define MEDIA_BASE_USER_INPUT_MONITOR_H_ +#include <stddef.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc index 5fc0dc9..c98ea6f 100644 --- a/media/base/user_input_monitor_linux.cc +++ b/media/base/user_input_monitor_linux.cc @@ -4,6 +4,7 @@ #include "media/base/user_input_monitor.h" +#include <stddef.h> #include <sys/select.h> #include <unistd.h> #define XK_MISCELLANY @@ -14,6 +15,7 @@ #include "base/compiler_specific.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_libevent.h" #include "base/single_thread_task_runner.h" diff --git a/media/base/user_input_monitor_mac.cc b/media/base/user_input_monitor_mac.cc index e469cbd..93c1852 100644 --- a/media/base/user_input_monitor_mac.cc +++ b/media/base/user_input_monitor_mac.cc @@ -5,6 +5,9 @@ #include "media/base/user_input_monitor.h" #include <ApplicationServices/ApplicationServices.h> +#include <stddef.h> + +#include "base/macros.h" namespace media { namespace { diff --git a/media/base/user_input_monitor_unittest.cc b/media/base/user_input_monitor_unittest.cc index 3f0ccd3..ab717d1 100644 --- a/media/base/user_input_monitor_unittest.cc +++ b/media/base/user_input_monitor_unittest.cc @@ -6,6 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "media/base/keyboard_event_counter.h" #include "media/base/user_input_monitor.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc index 3cab46d..f872b68 100644 --- a/media/base/user_input_monitor_win.cc +++ b/media/base/user_input_monitor_win.cc @@ -4,9 +4,13 @@ #include "media/base/user_input_monitor.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" diff --git a/media/base/vector_math_perftest.cc b/media/base/vector_math_perftest.cc index ae3b54e..bc70e1e 100644 --- a/media/base/vector_math_perftest.cc +++ b/media/base/vector_math_perftest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/vector_math.h" #include "media/base/vector_math_testing.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index a936923..e9519cc 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc @@ -6,10 +6,12 @@ #define _USE_MATH_DEFINES #include <cmath> +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" +#include "build/build_config.h" #include "media/base/vector_math.h" #include "media/base/vector_math_testing.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/video_capture_types.cc b/media/base/video_capture_types.cc index 1bd91fa..711367d 100644 --- a/media/base/video_capture_types.cc +++ b/media/base/video_capture_types.cc @@ -5,6 +5,7 @@ #include "media/base/video_capture_types.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "media/base/limits.h" #include "media/base/video_frame.h" diff --git a/media/base/video_capture_types.h b/media/base/video_capture_types.h index fa631a0..f7160ee 100644 --- a/media/base/video_capture_types.h +++ b/media/base/video_capture_types.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_VIDEO_CAPTURE_TYPES_H_ #define MEDIA_BASE_VIDEO_CAPTURE_TYPES_H_ +#include <stddef.h> + #include <vector> #include "build/build_config.h" diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 82ea665..8806bf2 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -5,9 +5,12 @@ #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h" #include "media/base/video_types.h" diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index c0e8996..4a9636f 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -10,9 +10,11 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/base/limits.h" #include "media/base/timestamp_constants.h" #include "media/base/video_util.h" diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 67f1417..edd9dd5 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BASE_VIDEO_FRAME_H_ #define MEDIA_BASE_VIDEO_FRAME_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/callback.h" @@ -12,6 +15,7 @@ #include "base/md5.h" #include "base/memory/shared_memory.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/video_frame_metadata.h" #include "media/base/video_types.h" diff --git a/media/base/video_frame_metadata.cc b/media/base/video_frame_metadata.cc index af2d36d..31b1918 100644 --- a/media/base/video_frame_metadata.cc +++ b/media/base/video_frame_metadata.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "media/base/video_frame_metadata.h" diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc index 52e17a9..40611ee 100644 --- a/media/base/video_frame_pool.cc +++ b/media/base/video_frame_pool.cc @@ -7,6 +7,7 @@ #include <list> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" diff --git a/media/base/video_frame_pool.h b/media/base/video_frame_pool.h index 167c0e9..ebd0e24 100644 --- a/media/base/video_frame_pool.h +++ b/media/base/video_frame_pool.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_VIDEO_FRAME_POOL_H_ #define MEDIA_BASE_VIDEO_FRAME_POOL_H_ +#include <stddef.h> + #include "base/macros.h" #include "media/base/media_export.h" #include "media/base/video_frame.h" diff --git a/media/base/video_frame_pool_unittest.cc b/media/base/video_frame_pool_unittest.cc index 9abed22..85ae773 100644 --- a/media/base/video_frame_pool_unittest.cc +++ b/media/base/video_frame_pool_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "media/base/video_frame_pool.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index c697d6f..18e1893 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -4,9 +4,13 @@ #include "media/base/video_frame.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" diff --git a/media/base/video_util.h b/media/base/video_util.h index da11084..e513433 100644 --- a/media/base/video_util.h +++ b/media/base/video_util.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_VIDEO_UTIL_H_ #define MEDIA_BASE_VIDEO_UTIL_H_ +#include <stdint.h> + #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/media/base/video_util_unittest.cc b/media/base/video_util_unittest.cc index 3ff2302..9819126 100644 --- a/media/base/video_util_unittest.cc +++ b/media/base/video_util_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/base/video_util.h" diff --git a/media/base/wall_clock_time_source_unittest.cc b/media/base/wall_clock_time_source_unittest.cc index f5f0bb3..dee7aff 100644 --- a/media/base/wall_clock_time_source_unittest.cc +++ b/media/base/wall_clock_time_source_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/wall_clock_time_source.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index 9bae5b3..629e543 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -17,6 +17,8 @@ #include "media/base/yuv_convert.h" +#include <stddef.h> + #include <algorithm> #include "base/cpu.h" @@ -44,26 +46,23 @@ extern "C" { void EmptyRegisterState_MMX(); } // extern "C" namespace media { -typedef void (*FilterYUVRowsProc)(uint8*, - const uint8*, - const uint8*, - int, - uint8); +typedef void ( + *FilterYUVRowsProc)(uint8_t*, const uint8_t*, const uint8_t*, int, uint8_t); -typedef void (*ConvertRGBToYUVProc)(const uint8*, - uint8*, - uint8*, - uint8*, +typedef void (*ConvertRGBToYUVProc)(const uint8_t*, + uint8_t*, + uint8_t*, + uint8_t*, int, int, int, int, int); -typedef void (*ConvertYUVToRGB32Proc)(const uint8*, - const uint8*, - const uint8*, - uint8*, +typedef void (*ConvertYUVToRGB32Proc)(const uint8_t*, + const uint8_t*, + const uint8_t*, + uint8_t*, int, int, int, @@ -71,11 +70,11 @@ typedef void (*ConvertYUVToRGB32Proc)(const uint8*, int, YUVType); -typedef void (*ConvertYUVAToARGBProc)(const uint8*, - const uint8*, - const uint8*, - const uint8*, - uint8*, +typedef void (*ConvertYUVAToARGBProc)(const uint8_t*, + const uint8_t*, + const uint8_t*, + const uint8_t*, + uint8_t*, int, int, int, @@ -84,28 +83,28 @@ typedef void (*ConvertYUVAToARGBProc)(const uint8*, int, YUVType); -typedef void (*ConvertYUVToRGB32RowProc)(const uint8*, - const uint8*, - const uint8*, - uint8*, +typedef void (*ConvertYUVToRGB32RowProc)(const uint8_t*, + const uint8_t*, + const uint8_t*, + uint8_t*, ptrdiff_t, - const int16*); + const int16_t*); -typedef void (*ConvertYUVAToARGBRowProc)(const uint8*, - const uint8*, - const uint8*, - const uint8*, - uint8*, +typedef void (*ConvertYUVAToARGBRowProc)(const uint8_t*, + const uint8_t*, + const uint8_t*, + const uint8_t*, + uint8_t*, ptrdiff_t, - const int16*); + const int16_t*); -typedef void (*ScaleYUVToRGB32RowProc)(const uint8*, - const uint8*, - const uint8*, - uint8*, +typedef void (*ScaleYUVToRGB32RowProc)(const uint8_t*, + const uint8_t*, + const uint8_t*, + uint8_t*, ptrdiff_t, ptrdiff_t, - const int16*); + const int16_t*); static FilterYUVRowsProc g_filter_yuv_rows_proc_ = NULL; static ConvertYUVToRGB32RowProc g_convert_yuv_to_rgb32_row_proc_ = NULL; @@ -116,7 +115,7 @@ static ConvertRGBToYUVProc g_convert_rgb24_to_yuv_proc_ = NULL; static ConvertYUVToRGB32Proc g_convert_yuv_to_rgb32_proc_ = NULL; static ConvertYUVAToARGBProc g_convert_yuva_to_argb_proc_ = NULL; -static const int kYUVToRGBTableSize = 256 * 4 * 4 * sizeof(int16); +static const int kYUVToRGBTableSize = 256 * 4 * 4 * sizeof(int16_t); // base::AlignedMemory has a private operator new(), so wrap it in a struct so // that we can put it in a LazyInstance::Leaky. @@ -129,9 +128,9 @@ typedef base::LazyInstance<YUVToRGBTableWrapper>::Leaky static YUVToRGBTable g_table_rec601 = LAZY_INSTANCE_INITIALIZER; static YUVToRGBTable g_table_jpeg = LAZY_INSTANCE_INITIALIZER; static YUVToRGBTable g_table_rec709 = LAZY_INSTANCE_INITIALIZER; -static const int16* g_table_rec601_ptr = NULL; -static const int16* g_table_jpeg_ptr = NULL; -static const int16* g_table_rec709_ptr = NULL; +static const int16_t* g_table_rec601_ptr = NULL; +static const int16_t* g_table_jpeg_ptr = NULL; +static const int16_t* g_table_rec709_ptr = NULL; // Empty SIMD registers state after using them. void EmptyRegisterStateStub() {} @@ -155,7 +154,7 @@ int GetVerticalShift(YUVType type) { return 0; } -const int16* GetLookupTable(YUVType type) { +const int16_t* GetLookupTable(YUVType type) { switch (type) { case YV12: case YV16: @@ -170,9 +169,9 @@ const int16* GetLookupTable(YUVType type) { } // Populates a pre-allocated lookup table from a YUV->RGB matrix. -const int16* PopulateYUVToRGBTable(const double matrix[3][3], - bool full_range, - int16* table) { +const int16_t* PopulateYUVToRGBTable(const double matrix[3][3], + bool full_range, + int16_t* table) { // We'll have 4 sub-tables that lie contiguous in memory, one for each of Y, // U, V and A. const int kNumTables = 4; @@ -181,7 +180,7 @@ const int16* PopulateYUVToRGBTable(const double matrix[3][3], // Each row has 4 columns, for contributions to each of R, G, B and A. const int kNumColumns = 4; // Each element is a fixed-point (10.6) 16-bit signed value. - const int kElementSize = sizeof(int16); + const int kElementSize = sizeof(int16_t); // Sanity check that our constants here match the size of the statically // allocated tables. @@ -304,14 +303,14 @@ void InitializeCPUSpecificYUVConversions() { }; PopulateYUVToRGBTable(kRec601ConvertMatrix, false, - g_table_rec601.Get().table.data_as<int16>()); + g_table_rec601.Get().table.data_as<int16_t>()); PopulateYUVToRGBTable(kJPEGConvertMatrix, true, - g_table_jpeg.Get().table.data_as<int16>()); + g_table_jpeg.Get().table.data_as<int16_t>()); PopulateYUVToRGBTable(kRec709ConvertMatrix, false, - g_table_rec709.Get().table.data_as<int16>()); - g_table_rec601_ptr = g_table_rec601.Get().table.data_as<int16>(); - g_table_rec709_ptr = g_table_rec709.Get().table.data_as<int16>(); - g_table_jpeg_ptr = g_table_jpeg.Get().table.data_as<int16>(); + g_table_rec709.Get().table.data_as<int16_t>()); + g_table_rec601_ptr = g_table_rec601.Get().table.data_as<int16_t>(); + g_table_rec709_ptr = g_table_rec709.Get().table.data_as<int16_t>(); + g_table_jpeg_ptr = g_table_jpeg.Get().table.data_as<int16_t>(); } // Empty SIMD registers state after using them. @@ -323,10 +322,10 @@ const int kFractionMax = 1 << kFractionBits; const int kFractionMask = ((1 << kFractionBits) - 1); // Scale a frame of YUV to 32 bit ARGB. -void ScaleYUVToRGB32(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void ScaleYUVToRGB32(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, int source_width, int source_height, int width, @@ -343,7 +342,7 @@ void ScaleYUVToRGB32(const uint8* y_buf, width == 0 || height == 0) return; - const int16* lookup_table = GetLookupTable(yuv_type); + const int16_t* lookup_table = GetLookupTable(yuv_type); // 4096 allows 3 buffers to fit in 12k. // Helps performance on CPU with 16K L1 cache. @@ -403,11 +402,11 @@ void ScaleYUVToRGB32(const uint8* y_buf, // Need padding because FilterRows() will write 1 to 16 extra pixels // after the end for SSE2 version. - uint8 yuvbuf[16 + kFilterBufferSize * 3 + 16]; - uint8* ybuf = - reinterpret_cast<uint8*>(reinterpret_cast<uintptr_t>(yuvbuf + 15) & ~15); - uint8* ubuf = ybuf + kFilterBufferSize; - uint8* vbuf = ubuf + kFilterBufferSize; + uint8_t yuvbuf[16 + kFilterBufferSize * 3 + 16]; + uint8_t* ybuf = reinterpret_cast<uint8_t*>( + reinterpret_cast<uintptr_t>(yuvbuf + 15) & ~15); + uint8_t* ubuf = ybuf + kFilterBufferSize; + uint8_t* vbuf = ubuf + kFilterBufferSize; // TODO(fbarchard): Fixed point math is off by 1 on negatives. @@ -426,7 +425,7 @@ void ScaleYUVToRGB32(const uint8* y_buf, // TODO(fbarchard): Split this into separate function for better efficiency. for (int y = 0; y < height; ++y) { - uint8* dest_pixel = rgb_buf + y * rgb_pitch; + uint8_t* dest_pixel = rgb_buf + y * rgb_pitch; int source_y_subpixel = source_y_subpixel_accum; source_y_subpixel_accum += source_y_subpixel_delta; if (source_y_subpixel < 0) @@ -434,9 +433,9 @@ void ScaleYUVToRGB32(const uint8* y_buf, else if (source_y_subpixel > ((source_height - 1) << kFractionBits)) source_y_subpixel = (source_height - 1) << kFractionBits; - const uint8* y_ptr = NULL; - const uint8* u_ptr = NULL; - const uint8* v_ptr = NULL; + const uint8_t* y_ptr = NULL; + const uint8_t* u_ptr = NULL; + const uint8_t* v_ptr = NULL; // Apply vertical filtering if necessary. // TODO(fbarchard): Remove memcpy when not necessary. if (filter & media::FILTER_BILINEAR_V) { @@ -446,7 +445,7 @@ void ScaleYUVToRGB32(const uint8* y_buf, v_ptr = v_buf + (source_y >> y_shift) * uv_pitch; // Vertical scaler uses 16.8 fixed point. - uint8 source_y_fraction = (source_y_subpixel & kFractionMask) >> 8; + uint8_t source_y_fraction = (source_y_subpixel & kFractionMask) >> 8; if (source_y_fraction != 0) { g_filter_yuv_rows_proc_( ybuf, y_ptr, y_ptr + y_pitch, source_width, source_y_fraction); @@ -457,7 +456,7 @@ void ScaleYUVToRGB32(const uint8* y_buf, ybuf[source_width] = ybuf[source_width - 1]; int uv_source_width = (source_width + 1) / 2; - uint8 source_uv_fraction; + uint8_t source_uv_fraction; // For formats with half-height UV planes, each even-numbered pixel row // should not interpolate, since the next row to interpolate from should @@ -506,10 +505,10 @@ void ScaleYUVToRGB32(const uint8* y_buf, } // Scale a frame of YV12 to 32 bit ARGB for a specific rectangle. -void ScaleYUVToRGB32WithRect(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, +void ScaleYUVToRGB32WithRect(const uint8_t* y_buf, + const uint8_t* u_buf, + const uint8_t* v_buf, + uint8_t* rgb_buf, int source_width, int source_height, int dest_width, @@ -531,7 +530,7 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, DCHECK(dest_rect_right > dest_rect_left); DCHECK(dest_rect_bottom > dest_rect_top); - const int16* lookup_table = GetLookupTable(YV12); + const int16_t* lookup_table = GetLookupTable(YV12); // Fixed-point value of vertical and horizontal scale down factor. // Values are in the format 16.16. @@ -582,14 +581,14 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, // write up to 16 bytes past the end of the buffer. const int kFilterBufferSize = 4096; const bool kAvoidUsingOptimizedFilter = source_width > kFilterBufferSize; - uint8 yuv_temp[16 + kFilterBufferSize * 3 + 16]; + uint8_t yuv_temp[16 + kFilterBufferSize * 3 + 16]; // memset() yuv_temp to 0 to avoid bogus warnings when running on Valgrind. if (RunningOnValgrind()) memset(yuv_temp, 0, sizeof(yuv_temp)); - uint8* y_temp = reinterpret_cast<uint8*>( + uint8_t* y_temp = reinterpret_cast<uint8_t*>( reinterpret_cast<uintptr_t>(yuv_temp + 15) & ~15); - uint8* u_temp = y_temp + kFilterBufferSize; - uint8* v_temp = u_temp + kFilterBufferSize; + uint8_t* u_temp = y_temp + kFilterBufferSize; + uint8_t* v_temp = u_temp + kFilterBufferSize; // Move to the top-left pixel of output. rgb_buf += dest_rect_top * rgb_pitch; @@ -604,12 +603,12 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, DCHECK(source_row < source_height); // Locate the first row for each plane for interpolation. - const uint8* y0_ptr = y_buf + y_pitch * source_row + source_y_left; - const uint8* u0_ptr = u_buf + uv_pitch * source_uv_row + source_uv_left; - const uint8* v0_ptr = v_buf + uv_pitch * source_uv_row + source_uv_left; - const uint8* y1_ptr = NULL; - const uint8* u1_ptr = NULL; - const uint8* v1_ptr = NULL; + const uint8_t* y0_ptr = y_buf + y_pitch * source_row + source_y_left; + const uint8_t* u0_ptr = u_buf + uv_pitch * source_uv_row + source_uv_left; + const uint8_t* v0_ptr = v_buf + uv_pitch * source_uv_row + source_uv_left; + const uint8_t* y1_ptr = NULL; + const uint8_t* u1_ptr = NULL; + const uint8_t* v1_ptr = NULL; // Locate the second row for interpolation, being careful not to overrun. if (source_row + 1 >= source_height) { @@ -627,7 +626,7 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, if (!kAvoidUsingOptimizedFilter) { // Vertical scaler uses 16.8 fixed point. - uint8 fraction = (source_top & kFractionMask) >> 8; + uint8_t fraction = (source_top & kFractionMask) >> 8; g_filter_yuv_rows_proc_( y_temp + source_y_left, y0_ptr, y1_ptr, source_y_width, fraction); g_filter_yuv_rows_proc_( @@ -655,10 +654,10 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, g_empty_register_state_proc_(); } -void ConvertRGB32ToYUV(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB32ToYUV(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -675,10 +674,10 @@ void ConvertRGB32ToYUV(const uint8* rgbframe, uvstride); } -void ConvertRGB24ToYUV(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +void ConvertRGB24ToYUV(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, @@ -695,10 +694,10 @@ void ConvertRGB24ToYUV(const uint8* rgbframe, uvstride); } -void ConvertYUVToRGB32(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +void ConvertYUVToRGB32(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -717,11 +716,11 @@ void ConvertYUVToRGB32(const uint8* yplane, yuv_type); } -void ConvertYUVAToARGB(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +void ConvertYUVAToARGB(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, int width, int height, int ystride, diff --git a/media/base/yuv_convert.h b/media/base/yuv_convert.h index 1d35d30..e10ca7d 100644 --- a/media/base/yuv_convert.h +++ b/media/base/yuv_convert.h @@ -5,7 +5,9 @@ #ifndef MEDIA_BASE_YUV_CONVERT_H_ #define MEDIA_BASE_YUV_CONVERT_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "build/build_config.h" #include "media/base/media_export.h" // Visual Studio 2010 does not support MMX intrinsics on x64. @@ -33,7 +35,7 @@ enum YUVType { MEDIA_EXPORT int GetVerticalShift(YUVType type); // Get the appropriate lookup table for a given YUV format. -MEDIA_EXPORT const int16* GetLookupTable(YUVType type); +MEDIA_EXPORT const int16_t* GetLookupTable(YUVType type); // Mirror means flip the image horizontally, as in looking in a mirror. // Rotate happens after mirroring. @@ -60,10 +62,10 @@ MEDIA_EXPORT void InitializeCPUSpecificYUVConversions(); // Convert a frame of YUV to 32 bit ARGB. // Pass in YV16/YV12 depending on source format -MEDIA_EXPORT void ConvertYUVToRGB32(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVToRGB32(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -73,11 +75,11 @@ MEDIA_EXPORT void ConvertYUVToRGB32(const uint8* yplane, // Convert a frame of YUVA to 32 bit ARGB. // Pass in YV12A -MEDIA_EXPORT void ConvertYUVAToARGB(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - const uint8* aplane, - uint8* rgbframe, +MEDIA_EXPORT void ConvertYUVAToARGB(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + const uint8_t* aplane, + uint8_t* rgbframe, int width, int height, int ystride, @@ -88,10 +90,10 @@ MEDIA_EXPORT void ConvertYUVAToARGB(const uint8* yplane, // Scale a frame of YUV to 32 bit ARGB. // Supports rotation and mirroring. -MEDIA_EXPORT void ScaleYUVToRGB32(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ScaleYUVToRGB32(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int source_width, int source_height, int width, @@ -106,10 +108,10 @@ MEDIA_EXPORT void ScaleYUVToRGB32(const uint8* yplane, // Biliner Scale a frame of YV12 to 32 bits ARGB on a specified rectangle. // |yplane|, etc and |rgbframe| should point to the top-left pixels of the // source and destination buffers. -MEDIA_EXPORT void ScaleYUVToRGB32WithRect(const uint8* yplane, - const uint8* uplane, - const uint8* vplane, - uint8* rgbframe, +MEDIA_EXPORT void ScaleYUVToRGB32WithRect(const uint8_t* yplane, + const uint8_t* uplane, + const uint8_t* vplane, + uint8_t* rgbframe, int source_width, int source_height, int dest_width, @@ -122,20 +124,20 @@ MEDIA_EXPORT void ScaleYUVToRGB32WithRect(const uint8* yplane, int uvstride, int rgbstride); -MEDIA_EXPORT void ConvertRGB32ToYUV(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB32ToYUV(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, int ystride, int uvstride); -MEDIA_EXPORT void ConvertRGB24ToYUV(const uint8* rgbframe, - uint8* yplane, - uint8* uplane, - uint8* vplane, +MEDIA_EXPORT void ConvertRGB24ToYUV(const uint8_t* rgbframe, + uint8_t* yplane, + uint8_t* uplane, + uint8_t* vplane, int width, int height, int rgbstride, diff --git a/media/base/yuv_convert_perftest.cc b/media/base/yuv_convert_perftest.cc index 2f6d5c1..3af1b75 100644 --- a/media/base/yuv_convert_perftest.cc +++ b/media/base/yuv_convert_perftest.cc @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/base_paths.h" #include "base/cpu.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/simd/convert_yuv_to_rgb.h" #include "media/base/yuv_convert.h" #include "testing/gtest/include/gtest/gtest.h" @@ -37,8 +41,8 @@ static const int kPerfTestIterations = 2000; class YUVConvertPerfTest : public testing::Test { public: YUVConvertPerfTest() - : yuv_bytes_(new uint8[kYUV12Size]), - rgb_bytes_converted_(new uint8[kRGBSize]) { + : yuv_bytes_(new uint8_t[kYUV12Size]), + rgb_bytes_converted_(new uint8_t[kRGBSize]) { base::FilePath path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &path)); path = path.Append(FILE_PATH_LITERAL("media")) @@ -47,7 +51,7 @@ class YUVConvertPerfTest : public testing::Test { .Append(FILE_PATH_LITERAL("bali_640x360_P420.yuv")); // Verify file size is correct. - int64 actual_size = 0; + int64_t actual_size = 0; base::GetFileSize(path, &actual_size); CHECK_EQ(actual_size, kYUV12Size); @@ -58,8 +62,8 @@ class YUVConvertPerfTest : public testing::Test { CHECK_EQ(bytes_read, kYUV12Size); } - scoped_ptr<uint8[]> yuv_bytes_; - scoped_ptr<uint8[]> rgb_bytes_converted_; + scoped_ptr<uint8_t[]> yuv_bytes_; + scoped_ptr<uint8_t[]> rgb_bytes_converted_; private: DISALLOW_COPY_AND_ASSIGN(YUVConvertPerfTest); diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc index cf4a511..77c48ce 100644 --- a/media/base/yuv_convert_unittest.cc +++ b/media/base/yuv_convert_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/base_paths.h" #include "base/cpu.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "build/build_config.h" #include "media/base/djb2.h" #include "media/base/simd/convert_rgb_to_yuv.h" #include "media/base/simd/convert_yuv_to_rgb.h" @@ -40,11 +44,11 @@ static const int kSourceAOffset = kSourceYSize * 12 / 8; static const int kYUVA12Size = kSourceYSize * 20 / 8; #endif -// Helper for reading test data into a scoped_ptr<uint8[]>. +// Helper for reading test data into a scoped_ptr<uint8_t[]>. static void ReadData(const base::FilePath::CharType* filename, int expected_size, - scoped_ptr<uint8[]>* data) { - data->reset(new uint8[expected_size]); + scoped_ptr<uint8_t[]>* data) { + data->reset(new uint8_t[expected_size]); base::FilePath path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &path)); @@ -54,7 +58,7 @@ static void ReadData(const base::FilePath::CharType* filename, .Append(filename); // Verify file size is correct. - int64 actual_size = 0; + int64_t actual_size = 0; base::GetFileSize(path, &actual_size); CHECK_EQ(actual_size, expected_size); @@ -64,22 +68,22 @@ static void ReadData(const base::FilePath::CharType* filename, CHECK_EQ(bytes_read, expected_size); } -static void ReadYV12Data(scoped_ptr<uint8[]>* data) { +static void ReadYV12Data(scoped_ptr<uint8_t[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_P420.yuv"), kYUV12Size, data); } -static void ReadYV16Data(scoped_ptr<uint8[]>* data) { +static void ReadYV16Data(scoped_ptr<uint8_t[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_P422.yuv"), kYUV16Size, data); } #if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY) && \ !defined(OS_ANDROID) -static void ReadYV12AData(scoped_ptr<uint8[]>* data) { +static void ReadYV12AData(scoped_ptr<uint8_t[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_P420_alpha.yuv"), kYUVA12Size, data); } #endif -static void ReadRGB24Data(scoped_ptr<uint8[]>* data) { +static void ReadRGB24Data(scoped_ptr<uint8_t[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_RGB24.rgb"), kRGB24Size, data); } @@ -96,9 +100,9 @@ namespace media { TEST(YUVConvertTest, YV12) { // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes; - scoped_ptr<uint8[]> rgb_bytes(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_converted_bytes(new uint8[kRGBSizeConverted]); + scoped_ptr<uint8_t[]> yuv_bytes; + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_converted_bytes(new uint8_t[kRGBSizeConverted]); // Read YUV reference data from file. ReadYV12Data(&yuv_bytes); @@ -118,16 +122,16 @@ TEST(YUVConvertTest, YV12) { SwapRedAndBlueChannels(rgb_converted_bytes.get(), kRGBSizeConverted); #endif - uint32 rgb_hash = DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted, - kDJB2HashSeed); + uint32_t rgb_hash = + DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted, kDJB2HashSeed); EXPECT_EQ(2413171226u, rgb_hash); } TEST(YUVConvertTest, YV16) { // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes; - scoped_ptr<uint8[]> rgb_bytes(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_converted_bytes(new uint8[kRGBSizeConverted]); + scoped_ptr<uint8_t[]> yuv_bytes; + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_converted_bytes(new uint8_t[kRGBSizeConverted]); // Read YUV reference data from file. ReadYV16Data(&yuv_bytes); @@ -147,21 +151,18 @@ TEST(YUVConvertTest, YV16) { SwapRedAndBlueChannels(rgb_converted_bytes.get(), kRGBSizeConverted); #endif - uint32 rgb_hash = DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted, - kDJB2HashSeed); + uint32_t rgb_hash = + DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted, kDJB2HashSeed); EXPECT_EQ(4222342047u, rgb_hash); } struct YUVScaleTestData { - YUVScaleTestData(media::YUVType y, media::ScaleFilter s, uint32 r) - : yuv_type(y), - scale_filter(s), - rgb_hash(r) { - } + YUVScaleTestData(media::YUVType y, media::ScaleFilter s, uint32_t r) + : yuv_type(y), scale_filter(s), rgb_hash(r) {} media::YUVType yuv_type; media::ScaleFilter scale_filter; - uint32 rgb_hash; + uint32_t rgb_hash; }; class YUVScaleTest : public ::testing::TestWithParam<YUVScaleTestData> { @@ -178,13 +179,13 @@ class YUVScaleTest : public ::testing::TestWithParam<YUVScaleTestData> { break; } - rgb_bytes_.reset(new uint8[kRGBSizeScaled]); + rgb_bytes_.reset(new uint8_t[kRGBSizeScaled]); } // Helpers for getting the proper Y, U and V plane offsets. - uint8* y_plane() { return yuv_bytes_.get(); } - uint8* u_plane() { return yuv_bytes_.get() + kSourceYSize; } - uint8* v_plane() { + uint8_t* y_plane() { return yuv_bytes_.get(); } + uint8_t* u_plane() { return yuv_bytes_.get() + kSourceYSize; } + uint8_t* v_plane() { switch (GetParam().yuv_type) { case media::YV12: case media::YV12J: @@ -196,8 +197,8 @@ class YUVScaleTest : public ::testing::TestWithParam<YUVScaleTestData> { return NULL; } - scoped_ptr<uint8[]> yuv_bytes_; - scoped_ptr<uint8[]> rgb_bytes_; + scoped_ptr<uint8_t[]> yuv_bytes_; + scoped_ptr<uint8_t[]> rgb_bytes_; }; TEST_P(YUVScaleTest, NoScale) { @@ -214,7 +215,7 @@ TEST_P(YUVScaleTest, NoScale) { media::ROTATE_0, GetParam().scale_filter); - uint32 yuv_hash = DJB2Hash(rgb_bytes_.get(), kRGBSize, kDJB2HashSeed); + uint32_t yuv_hash = DJB2Hash(rgb_bytes_.get(), kRGBSize, kDJB2HashSeed); media::ConvertYUVToRGB32(y_plane(), // Y u_plane(), // U @@ -226,7 +227,7 @@ TEST_P(YUVScaleTest, NoScale) { kSourceWidth * kBpp, // RGBStride GetParam().yuv_type); - uint32 rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSize, kDJB2HashSeed); + uint32_t rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSize, kDJB2HashSeed); EXPECT_EQ(yuv_hash, rgb_hash); } @@ -249,7 +250,7 @@ TEST_P(YUVScaleTest, Normal) { SwapRedAndBlueChannels(rgb_bytes_.get(), kRGBSizeScaled); #endif - uint32 rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSizeScaled, kDJB2HashSeed); + uint32_t rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSizeScaled, kDJB2HashSeed); EXPECT_EQ(GetParam().rgb_hash, rgb_hash); } @@ -313,9 +314,9 @@ INSTANTIATE_TEST_CASE_P( // This tests a known worst case YUV value, and for overflow. TEST(YUVConvertTest, Clamp) { // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes(new uint8[1]); - scoped_ptr<uint8[]> rgb_bytes(new uint8[1]); - scoped_ptr<uint8[]> rgb_converted_bytes(new uint8[1]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[1]); + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[1]); + scoped_ptr<uint8_t[]> rgb_converted_bytes(new uint8_t[1]); // Values that failed previously in bug report. unsigned char y = 255u; @@ -346,8 +347,8 @@ TEST(YUVConvertTest, Clamp) { TEST(YUVConvertTest, RGB24ToYUV) { // Allocate all surfaces. - scoped_ptr<uint8[]> rgb_bytes; - scoped_ptr<uint8[]> yuv_converted_bytes(new uint8[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes; + scoped_ptr<uint8_t[]> yuv_converted_bytes(new uint8_t[kYUV12Size]); // Read RGB24 reference data from file. ReadRGB24Data(&rgb_bytes); @@ -362,17 +363,17 @@ TEST(YUVConvertTest, RGB24ToYUV) { kSourceWidth, // YStride kSourceWidth / 2); // UVStride - uint32 rgb_hash = DJB2Hash(yuv_converted_bytes.get(), kYUV12Size, - kDJB2HashSeed); + uint32_t rgb_hash = + DJB2Hash(yuv_converted_bytes.get(), kYUV12Size, kDJB2HashSeed); EXPECT_EQ(320824432u, rgb_hash); } TEST(YUVConvertTest, RGB32ToYUV) { // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes(new uint8[kRGBSize]); - scoped_ptr<uint8[]> yuv_converted_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_converted_bytes(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_converted_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_converted_bytes(new uint8_t[kRGBSize]); // Read YUV reference data from file. base::FilePath yuv_url; @@ -440,7 +441,7 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { .Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("bali_640x360_P420.yuv")); const size_t size_of_yuv = kSourceYSize * 12 / 8; // 12 bpp. - scoped_ptr<uint8[]> yuv_bytes(new uint8[size_of_yuv]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[size_of_yuv]); EXPECT_EQ(static_cast<int>(size_of_yuv), base::ReadFile(yuv_url, reinterpret_cast<char*>(yuv_bytes.get()), @@ -449,7 +450,7 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { // Scale the full frame of YUV to 32 bit ARGB. // The API currently only supports down-scaling, so we don't test up-scaling. const size_t size_of_rgb_scaled = kDownScaledWidth * kDownScaledHeight * kBpp; - scoped_ptr<uint8[]> rgb_scaled_bytes(new uint8[size_of_rgb_scaled]); + scoped_ptr<uint8_t[]> rgb_scaled_bytes(new uint8_t[size_of_rgb_scaled]); gfx::Rect sub_rect(0, 0, kDownScaledWidth, kDownScaledHeight); // We can't compare with the full-frame scaler because it uses slightly @@ -467,9 +468,8 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { kSourceWidth / 2, // UvStride kDownScaledWidth * kBpp); // RgbStride - uint32 rgb_hash_full_rect = DJB2Hash(rgb_scaled_bytes.get(), - size_of_rgb_scaled, - kDJB2HashSeed); + uint32_t rgb_hash_full_rect = + DJB2Hash(rgb_scaled_bytes.get(), size_of_rgb_scaled, kDJB2HashSeed); // Re-scale sub-rectangles and verify the results are the same. int next_sub_rect = 0; @@ -487,9 +487,8 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { kSourceWidth, // YStride kSourceWidth / 2, // UvStride kDownScaledWidth * kBpp); // RgbStride - uint32 rgb_hash_sub_rect = DJB2Hash(rgb_scaled_bytes.get(), - size_of_rgb_scaled, - kDJB2HashSeed); + uint32_t rgb_hash_sub_rect = + DJB2Hash(rgb_scaled_bytes.get(), size_of_rgb_scaled, kDJB2HashSeed); EXPECT_EQ(rgb_hash_full_rect, rgb_hash_sub_rect); @@ -508,10 +507,10 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { #if !defined(OS_ANDROID) TEST(YUVConvertTest, YUVAtoARGB_MMX_MatchReference) { // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes; - scoped_ptr<uint8[]> rgb_bytes(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_converted_bytes(new uint8[kRGBSizeConverted]); - scoped_ptr<uint8[]> rgb_converted_bytes_ref(new uint8[kRGBSizeConverted]); + scoped_ptr<uint8_t[]> yuv_bytes; + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_converted_bytes(new uint8_t[kRGBSizeConverted]); + scoped_ptr<uint8_t[]> rgb_converted_bytes_ref(new uint8_t[kRGBSizeConverted]); // Read YUV reference data from file. ReadYV12AData(&yuv_bytes); @@ -557,10 +556,10 @@ TEST(YUVConvertTest, RGB32ToYUV_SSE2_MatchReference) { } // Allocate all surfaces. - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes(new uint8[kRGBSize]); - scoped_ptr<uint8[]> yuv_converted_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> yuv_reference_bytes(new uint8[kYUV12Size]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_converted_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> yuv_reference_bytes(new uint8_t[kYUV12Size]); ReadYV12Data(&yuv_bytes); @@ -643,9 +642,9 @@ TEST(YUVConvertTest, ConvertYUVToRGB32Row_SSE) { return; } - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes_reference(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_bytes_converted(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes_reference(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_bytes_converted(new uint8_t[kRGBSize]); ReadYV12Data(&yuv_bytes); const int kWidth = 167; @@ -677,9 +676,9 @@ TEST(YUVConvertTest, ScaleYUVToRGB32Row_SSE) { return; } - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes_reference(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_bytes_converted(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes_reference(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_bytes_converted(new uint8_t[kRGBSize]); ReadYV12Data(&yuv_bytes); const int kWidth = 167; @@ -711,9 +710,9 @@ TEST(YUVConvertTest, LinearScaleYUVToRGB32Row_SSE) { return; } - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes_reference(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_bytes_converted(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes_reference(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_bytes_converted(new uint8_t[kRGBSize]); ReadYV12Data(&yuv_bytes); const int kWidth = 167; @@ -740,8 +739,8 @@ TEST(YUVConvertTest, LinearScaleYUVToRGB32Row_SSE) { #endif // defined(OS_WIN) && (ARCH_CPU_X86 || COMPONENT_BUILD) TEST(YUVConvertTest, FilterYUVRows_C_OutOfBounds) { - scoped_ptr<uint8[]> src(new uint8[16]); - scoped_ptr<uint8[]> dst(new uint8[16]); + scoped_ptr<uint8_t[]> src(new uint8_t[16]); + scoped_ptr<uint8_t[]> dst(new uint8_t[16]); memset(src.get(), 0xff, 16); memset(dst.get(), 0, 16); @@ -761,8 +760,8 @@ TEST(YUVConvertTest, FilterYUVRows_SSE2_OutOfBounds) { return; } - scoped_ptr<uint8[]> src(new uint8[16]); - scoped_ptr<uint8[]> dst(new uint8[16]); + scoped_ptr<uint8_t[]> src(new uint8_t[16]); + scoped_ptr<uint8_t[]> dst(new uint8_t[16]); memset(src.get(), 0xff, 16); memset(dst.get(), 0, 16); @@ -783,9 +782,9 @@ TEST(YUVConvertTest, FilterYUVRows_SSE2_UnalignedDestination) { } const int kSize = 64; - scoped_ptr<uint8[]> src(new uint8[kSize]); - scoped_ptr<uint8[]> dst_sample(new uint8[kSize]); - scoped_ptr<uint8[]> dst(new uint8[kSize]); + scoped_ptr<uint8_t[]> src(new uint8_t[kSize]); + scoped_ptr<uint8_t[]> dst_sample(new uint8_t[kSize]); + scoped_ptr<uint8_t[]> dst(new uint8_t[kSize]); memset(dst_sample.get(), 0, kSize); memset(dst.get(), 0, kSize); @@ -796,9 +795,8 @@ TEST(YUVConvertTest, FilterYUVRows_SSE2_UnalignedDestination) { src.get(), src.get(), 37, 128); // Generate an unaligned output address. - uint8* dst_ptr = - reinterpret_cast<uint8*>( - (reinterpret_cast<uintptr_t>(dst.get() + 16) & ~15) + 1); + uint8_t* dst_ptr = reinterpret_cast<uint8_t*>( + (reinterpret_cast<uintptr_t>(dst.get() + 16) & ~15) + 1); media::FilterYUVRows_SSE2(dst_ptr, src.get(), src.get(), 37, 128); media::EmptyRegisterState(); @@ -808,9 +806,9 @@ TEST(YUVConvertTest, FilterYUVRows_SSE2_UnalignedDestination) { #if defined(ARCH_CPU_X86_64) TEST(YUVConvertTest, ScaleYUVToRGB32Row_SSE2_X64) { - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes_reference(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_bytes_converted(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes_reference(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_bytes_converted(new uint8_t[kRGBSize]); ReadYV12Data(&yuv_bytes); const int kWidth = 167; @@ -836,9 +834,9 @@ TEST(YUVConvertTest, ScaleYUVToRGB32Row_SSE2_X64) { } TEST(YUVConvertTest, LinearScaleYUVToRGB32Row_MMX_X64) { - scoped_ptr<uint8[]> yuv_bytes(new uint8[kYUV12Size]); - scoped_ptr<uint8[]> rgb_bytes_reference(new uint8[kRGBSize]); - scoped_ptr<uint8[]> rgb_bytes_converted(new uint8[kRGBSize]); + scoped_ptr<uint8_t[]> yuv_bytes(new uint8_t[kYUV12Size]); + scoped_ptr<uint8_t[]> rgb_bytes_reference(new uint8_t[kRGBSize]); + scoped_ptr<uint8_t[]> rgb_bytes_converted(new uint8_t[kRGBSize]); ReadYV12Data(&yuv_bytes); const int kWidth = 167; diff --git a/media/blink/buffered_data_source.cc b/media/blink/buffered_data_source.cc index 2766aed..4dd9fb5 100644 --- a/media/blink/buffered_data_source.cc +++ b/media/blink/buffered_data_source.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "media/base/media_log.h" #include "net/base/net_errors.h" diff --git a/media/blink/buffered_data_source.h b/media/blink/buffered_data_source.h index 5208499..17b7507 100644 --- a/media/blink/buffered_data_source.h +++ b/media/blink/buffered_data_source.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_BUFFERED_DATA_SOURCE_H_ #define MEDIA_BLINK_BUFFERED_DATA_SOURCE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/blink/buffered_data_source_host_impl.h b/media/blink/buffered_data_source_host_impl.h index f50084e..846fd31 100644 --- a/media/blink/buffered_data_source_host_impl.h +++ b/media/blink/buffered_data_source_host_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_ #define MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/time/time.h" #include "media/blink/buffered_data_source.h" diff --git a/media/blink/buffered_data_source_host_impl_unittest.cc b/media/blink/buffered_data_source_host_impl_unittest.cc index ef0a461..54ecf75 100644 --- a/media/blink/buffered_data_source_host_impl_unittest.cc +++ b/media/blink/buffered_data_source_host_impl_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "media/blink/buffered_data_source_host_impl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/blink/buffered_data_source_unittest.cc b/media/blink/buffered_data_source_unittest.cc index 719ed2c..eb2114c 100644 --- a/media/blink/buffered_data_source_unittest.cc +++ b/media/blink/buffered_data_source_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "media/base/media_log.h" diff --git a/media/blink/buffered_resource_loader.cc b/media/blink/buffered_resource_loader.cc index f742f89..dedd3bf 100644 --- a/media/blink/buffered_resource_loader.cc +++ b/media/blink/buffered_resource_loader.cc @@ -4,6 +4,7 @@ #include "media/blink/buffered_resource_loader.h" +#include <stddef.h> #include <stdint.h> #include <limits> diff --git a/media/blink/buffered_resource_loader.h b/media/blink/buffered_resource_loader.h index 4410866..6cc1aa6 100644 --- a/media/blink/buffered_resource_loader.h +++ b/media/blink/buffered_resource_loader.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_ #define MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/blink/buffered_resource_loader_unittest.cc b/media/blink/buffered_resource_loader_unittest.cc index 0974b5d..3065291 100644 --- a/media/blink/buffered_resource_loader_unittest.cc +++ b/media/blink/buffered_resource_loader_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <algorithm> #include <string> #include "base/bind.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "media/base/media_log.h" diff --git a/media/blink/cache_util.cc b/media/blink/cache_util.cc index d540980..4d0a44c 100644 --- a/media/blink/cache_util.cc +++ b/media/blink/cache_util.cc @@ -4,8 +4,11 @@ #include "media/blink/cache_util.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/time/time.h" diff --git a/media/blink/cache_util.h b/media/blink/cache_util.h index dc66c3d..16e5c31 100644 --- a/media/blink/cache_util.h +++ b/media/blink/cache_util.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_CACHE_UTIL_H_ #define MEDIA_BLINK_CACHE_UTIL_H_ +#include <stdint.h> + #include <vector> #include "base/time/time.h" diff --git a/media/blink/cache_util_unittest.cc b/media/blink/cache_util_unittest.cc index 4ba26aa..a9c409e 100644 --- a/media/blink/cache_util_unittest.cc +++ b/media/blink/cache_util_unittest.cc @@ -4,9 +4,13 @@ #include "media/blink/cache_util.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h index d34912f..179654e 100644 --- a/media/blink/cdm_result_promise.h +++ b/media/blink/cdm_result_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_H_ #define MEDIA_BLINK_CDM_RESULT_PROMISE_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/base/media_keys.h" diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h index 1acdf7a..61417db 100644 --- a/media/blink/cdm_session_adapter.h +++ b/media/blink/cdm_session_adapter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_CDM_SESSION_ADAPTER_H_ #define MEDIA_BLINK_CDM_SESSION_ADAPTER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> diff --git a/media/blink/encrypted_media_player_support.cc b/media/blink/encrypted_media_player_support.cc index 9e245b6..9e9a039 100644 --- a/media/blink/encrypted_media_player_support.cc +++ b/media/blink/encrypted_media_player_support.cc @@ -4,6 +4,8 @@ #include "media/blink/encrypted_media_player_support.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/histogram.h" diff --git a/media/blink/encrypted_media_player_support.h b/media/blink/encrypted_media_player_support.h index e2f1cfd..2933a62 100644 --- a/media/blink/encrypted_media_player_support.h +++ b/media/blink/encrypted_media_player_support.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc index 625e421..2d1577e 100644 --- a/media/blink/key_system_config_selector.cc +++ b/media/blink/key_system_config_selector.cc @@ -4,6 +4,8 @@ #include "key_system_config_selector.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" diff --git a/media/blink/key_system_config_selector_unittest.cc b/media/blink/key_system_config_selector_unittest.cc index 70b890d..3f96d0f 100644 --- a/media/blink/key_system_config_selector_unittest.cc +++ b/media/blink/key_system_config_selector_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "media/base/eme_constants.h" diff --git a/media/blink/lru.h b/media/blink/lru.h index 1dc1f6d..4c1d5ff 100644 --- a/media/blink/lru.h +++ b/media/blink/lru.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_LRU_H_ #define MEDIA_BLINK_LRU_H_ +#include <stddef.h> + #include <list> #include "base/containers/hash_tables.h" diff --git a/media/blink/lru_unittest.cc b/media/blink/lru_unittest.cc index e23ca07..8212170 100644 --- a/media/blink/lru_unittest.cc +++ b/media/blink/lru_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <list> #include "base/logging.h" diff --git a/media/blink/multibuffer.h b/media/blink/multibuffer.h index eb3530d..6478914 100644 --- a/media/blink/multibuffer.h +++ b/media/blink/multibuffer.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BLINK_MULTIBUFFER_H_ #define MEDIA_BLINK_MULTIBUFFER_H_ +#include <stddef.h> #include <stdint.h> #include <limits> @@ -17,6 +18,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "media/base/data_buffer.h" #include "media/blink/interval_map.h" #include "media/blink/lru.h" diff --git a/media/blink/multibuffer_data_source.cc b/media/blink/multibuffer_data_source.cc index 36be309..103b1a0 100644 --- a/media/blink/multibuffer_data_source.cc +++ b/media/blink/multibuffer_data_source.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "media/base/media_log.h" #include "media/blink/multibuffer_reader.h" diff --git a/media/blink/multibuffer_data_source.h b/media/blink/multibuffer_data_source.h index 9bff5c6..edf02c85 100644 --- a/media/blink/multibuffer_data_source.h +++ b/media/blink/multibuffer_data_source.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_MULTIBUFFER_DATA_SOURCE_H_ #define MEDIA_BLINK_MULTIBUFFER_DATA_SOURCE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc index 9fbf5a0..cdeeff6 100644 --- a/media/blink/multibuffer_data_source_unittest.cc +++ b/media/blink/multibuffer_data_source_unittest.cc @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "media/base/media_log.h" diff --git a/media/blink/multibuffer_reader.cc b/media/blink/multibuffer_reader.cc index 62b7909..b9d0752 100644 --- a/media/blink/multibuffer_reader.cc +++ b/media/blink/multibuffer_reader.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/message_loop/message_loop.h" diff --git a/media/blink/multibuffer_unittest.cc b/media/blink/multibuffer_unittest.cc index 4a2a64b..63478ff 100644 --- a/media/blink/multibuffer_unittest.cc +++ b/media/blink/multibuffer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <string> #include <vector> diff --git a/media/blink/new_session_cdm_result_promise.h b/media/blink/new_session_cdm_result_promise.h index 4ab9267..a63e1fc 100644 --- a/media/blink/new_session_cdm_result_promise.h +++ b/media/blink/new_session_cdm_result_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ #define MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/blink/resource_multibuffer_data_provider.cc b/media/blink/resource_multibuffer_data_provider.cc index b7951fd..b3357c5 100644 --- a/media/blink/resource_multibuffer_data_provider.cc +++ b/media/blink/resource_multibuffer_data_provider.cc @@ -4,6 +4,8 @@ #include "media/blink/resource_multibuffer_data_provider.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bits.h" #include "base/callback_helpers.h" diff --git a/media/blink/resource_multibuffer_data_provider.h b/media/blink/resource_multibuffer_data_provider.h index 60bd0e7..ee5a9e8 100644 --- a/media/blink/resource_multibuffer_data_provider.h +++ b/media/blink/resource_multibuffer_data_provider.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_RESOURCE_MULTIBUFFER_DATA_PROVIDER_H_ #define MEDIA_BLINK_RESOURCE_MULTIBUFFER_DATA_PROVIDER_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/blink/resource_multibuffer_data_provider_unittest.cc b/media/blink/resource_multibuffer_data_provider_unittest.cc index 7c069ac1..f3d7556 100644 --- a/media/blink/resource_multibuffer_data_provider_unittest.cc +++ b/media/blink/resource_multibuffer_data_provider_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <algorithm> #include <string> #include "base/bind.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "media/base/media_log.h" diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc index cc8c0ed..afa4290 100644 --- a/media/blink/run_all_unittests.cc +++ b/media/blink/run_all_unittests.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/rand_util.h" diff --git a/media/blink/test_random.h b/media/blink/test_random.h index de3df9f..8cc4211 100644 --- a/media/blink/test_random.h +++ b/media/blink/test_random.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_TEST_RANDOM_H_ #define MEDIA_BLINK_TEST_RANDOM_H_ +#include <stdint.h> + // Vastly simplified ACM random class meant to only be used for testing. // This class is meant to generate predictable sequences of pseudorandom // numbers, unlike the classes in base/rand_util.h which are meant to generate diff --git a/media/blink/test_response_generator.h b/media/blink/test_response_generator.h index 0341e5e1..ce76aa6 100644 --- a/media/blink/test_response_generator.h +++ b/media/blink/test_response_generator.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_TEST_RESPONSE_GENERATOR_H_ #define MEDIA_BLINK_TEST_RESPONSE_GENERATOR_H_ +#include <stdint.h> + #include "base/macros.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/media/blink/url_index.h b/media/blink/url_index.h index 2850b3b..43d4e62c5 100644 --- a/media/blink/url_index.h +++ b/media/blink/url_index.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BLINK_URL_INDEX_H_ #define MEDIA_BLINK_URL_INDEX_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> diff --git a/media/blink/video_frame_compositor_unittest.cc b/media/blink/video_frame_compositor_unittest.cc index a6b9ee1..b2e1695 100644 --- a/media/blink/video_frame_compositor_unittest.cc +++ b/media/blink/video_frame_compositor_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/blink/webaudiosourceprovider_impl.cc b/media/blink/webaudiosourceprovider_impl.cc index 0276a7b..5b70a309 100644 --- a/media/blink/webaudiosourceprovider_impl.cc +++ b/media/blink/webaudiosourceprovider_impl.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "media/base/bind_to_current_loop.h" #include "third_party/WebKit/public/platform/WebAudioSourceProviderClient.h" diff --git a/media/blink/webaudiosourceprovider_impl.h b/media/blink/webaudiosourceprovider_impl.h index 1feb33f..afdf1e3 100644 --- a/media/blink/webaudiosourceprovider_impl.h +++ b/media/blink/webaudiosourceprovider_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_WEBAUDIOSOURCEPROVIDER_IMPL_H_ #define MEDIA_BLINK_WEBAUDIOSOURCEPROVIDER_IMPL_H_ +#include <stddef.h> + #include <string> #include "base/callback.h" diff --git a/media/blink/webaudiosourceprovider_impl_unittest.cc b/media/blink/webaudiosourceprovider_impl_unittest.cc index fddabbc..f5efffb 100644 --- a/media/blink/webaudiosourceprovider_impl_unittest.cc +++ b/media/blink/webaudiosourceprovider_impl_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "media/audio/audio_parameters.h" diff --git a/media/blink/webcontentdecryptionmodule_impl.h b/media/blink/webcontentdecryptionmodule_impl.h index c11295e..ea4d2d9 100644 --- a/media/blink/webcontentdecryptionmodule_impl.h +++ b/media/blink/webcontentdecryptionmodule_impl.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/blink/webcontentdecryptionmodulesession_impl.h b/media/blink/webcontentdecryptionmodulesession_impl.h index 956c18d..18db472 100644 --- a/media/blink/webcontentdecryptionmodulesession_impl.h +++ b/media/blink/webcontentdecryptionmodulesession_impl.h @@ -5,6 +5,9 @@ #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h index c5ef54c..d97a0b4 100644 --- a/media/blink/webmediaplayer_impl.h +++ b/media/blink/webmediaplayer_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h index 7e6cf29..9ed1f82 100644 --- a/media/blink/webmediaplayer_params.h +++ b/media/blink/webmediaplayer_params.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/blink/webmediaplayer_util.cc b/media/blink/webmediaplayer_util.cc index f18a6be..e1dc363 100644 --- a/media/blink/webmediaplayer_util.cc +++ b/media/blink/webmediaplayer_util.cc @@ -5,6 +5,7 @@ #include "media/blink/webmediaplayer_util.h" #include <math.h> +#include <stddef.h> #include <string> #include "base/metrics/histogram.h" diff --git a/media/blink/websourcebuffer_impl.h b/media/blink/websourcebuffer_impl.h index 600ab70..9111fd2 100644 --- a/media/blink/websourcebuffer_impl.h +++ b/media/blink/websourcebuffer_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BLINK_WEBSOURCEBUFFER_IMPL_H_ #define MEDIA_BLINK_WEBSOURCEBUFFER_IMPL_H_ +#include <stddef.h> + #include <string> #include "base/compiler_specific.h" diff --git a/media/capture/content/animated_content_sampler.cc b/media/capture/content/animated_content_sampler.cc index 01c9fd4..371ae1f 100644 --- a/media/capture/content/animated_content_sampler.cc +++ b/media/capture/content/animated_content_sampler.cc @@ -4,6 +4,9 @@ #include "media/capture/content/animated_content_sampler.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> namespace media { diff --git a/media/capture/content/animated_content_sampler_unittest.cc b/media/capture/content/animated_content_sampler_unittest.cc index 697559f..4b8edec 100644 --- a/media/capture/content/animated_content_sampler_unittest.cc +++ b/media/capture/content/animated_content_sampler_unittest.cc @@ -4,6 +4,9 @@ #include "media/capture/content/animated_content_sampler.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include <utility> #include <vector> diff --git a/media/capture/content/capture_resolution_chooser_unittest.cc b/media/capture/content/capture_resolution_chooser_unittest.cc index 4a41f0d..a0346b1 100644 --- a/media/capture/content/capture_resolution_chooser_unittest.cc +++ b/media/capture/content/capture_resolution_chooser_unittest.cc @@ -4,7 +4,10 @@ #include "media/capture/content/capture_resolution_chooser.h" +#include <stddef.h> + #include "base/location.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" using tracked_objects::Location; diff --git a/media/capture/content/screen_capture_device_core.cc b/media/capture/content/screen_capture_device_core.cc index 5ea0450..d87b0a5 100644 --- a/media/capture/content/screen_capture_device_core.cc +++ b/media/capture/content/screen_capture_device_core.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/media/capture/content/smooth_event_sampler.cc b/media/capture/content/smooth_event_sampler.cc index 04af086..9ac263d 100644 --- a/media/capture/content/smooth_event_sampler.cc +++ b/media/capture/content/smooth_event_sampler.cc @@ -4,6 +4,8 @@ #include "media/capture/content/smooth_event_sampler.h" +#include <stdint.h> + #include <algorithm> #include "base/trace_event/trace_event.h" diff --git a/media/capture/content/smooth_event_sampler_unittest.cc b/media/capture/content/smooth_event_sampler_unittest.cc index 4fa6325..428a863 100644 --- a/media/capture/content/smooth_event_sampler_unittest.cc +++ b/media/capture/content/smooth_event_sampler_unittest.cc @@ -4,6 +4,10 @@ #include "media/capture/content/smooth_event_sampler.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/capture/content/thread_safe_capture_oracle.cc b/media/capture/content/thread_safe_capture_oracle.cc index 1d11d8c..a721a94 100644 --- a/media/capture/content/thread_safe_capture_oracle.cc +++ b/media/capture/content/thread_safe_capture_oracle.cc @@ -4,6 +4,8 @@ #include "media/capture/content/thread_safe_capture_oracle.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bits.h" #include "base/logging.h" diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc index 8d2f19a..e8f99f1 100644 --- a/media/capture/video/android/video_capture_device_android.cc +++ b/media/capture/video/android/video_capture_device_android.cc @@ -4,6 +4,8 @@ #include "media/capture/video/android/video_capture_device_android.h" +#include <stdint.h> + #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/strings/string_number_conversions.h" diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc index 302a0c9..a30b398 100644 --- a/media/capture/video/fake_video_capture_device.cc +++ b/media/capture/video/fake_video_capture_device.cc @@ -4,6 +4,8 @@ #include "media/capture/video/fake_video_capture_device.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h" diff --git a/media/capture/video/fake_video_capture_device.h b/media/capture/video/fake_video_capture_device.h index c311104..f6cc44b 100644 --- a/media/capture/video/fake_video_capture_device.h +++ b/media/capture/video/fake_video_capture_device.h @@ -8,6 +8,8 @@ #ifndef MEDIA_VIDEO_CAPTURE_FAKE_VIDEO_CAPTURE_DEVICE_H_ #define MEDIA_VIDEO_CAPTURE_FAKE_VIDEO_CAPTURE_DEVICE_H_ +#include <stdint.h> + #include <string> #include "base/atomicops.h" diff --git a/media/capture/video/fake_video_capture_device_factory.cc b/media/capture/video/fake_video_capture_device_factory.cc index 78148f8..e97f29b 100644 --- a/media/capture/video/fake_video_capture_device_factory.cc +++ b/media/capture/video/fake_video_capture_device_factory.cc @@ -10,6 +10,7 @@ #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/base/media_switches.h" namespace media { diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc index 0af5228..64dd94c 100644 --- a/media/capture/video/fake_video_capture_device_unittest.cc +++ b/media/capture/video/fake_video_capture_device_unittest.cc @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "media/base/media_switches.h" #include "media/base/video_capture_types.h" #include "media/capture/video/fake_video_capture_device.h" diff --git a/media/capture/video/file_video_capture_device.cc b/media/capture/video/file_video_capture_device.cc index d241cc3..5c509f2 100644 --- a/media/capture/video/file_video_capture_device.cc +++ b/media/capture/video/file_video_capture_device.cc @@ -4,7 +4,10 @@ #include "media/capture/video/file_video_capture_device.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "media/base/video_capture_types.h" diff --git a/media/capture/video/file_video_capture_device.h b/media/capture/video/file_video_capture_device.h index 7a02a92..af615d4 100644 --- a/media/capture/video/file_video_capture_device.h +++ b/media/capture/video/file_video_capture_device.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_CAPTURE_FILE_VIDEO_CAPTURE_DEVICE_H_ #define MEDIA_VIDEO_CAPTURE_FILE_VIDEO_CAPTURE_DEVICE_H_ +#include <stdint.h> + #include <string> #include "base/files/file.h" diff --git a/media/capture/video/file_video_capture_device_factory.cc b/media/capture/video/file_video_capture_device_factory.cc index ea36c4d..aa1b69a 100644 --- a/media/capture/video/file_video_capture_device_factory.cc +++ b/media/capture/video/file_video_capture_device_factory.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/sys_string_conversions.h" +#include "build/build_config.h" #include "media/base/media_switches.h" #include "media/capture/video/file_video_capture_device.h" 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" diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm index 45cd482..2ad5efe 100644 --- a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm +++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm @@ -6,6 +6,8 @@ #import <CoreMedia/CoreMedia.h> #import <CoreVideo/CoreVideo.h> +#include <stddef.h> +#include <stdint.h> #include "base/location.h" #include "base/logging.h" diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.h b/media/capture/video/mac/video_capture_device_decklink_mac.h index 641fba6..94eaa91 100644 --- a/media/capture/video/mac/video_capture_device_decklink_mac.h +++ b/media/capture/video/mac/video_capture_device_decklink_mac.h @@ -11,6 +11,8 @@ #include "media/capture/video/video_capture_device.h" #import <Foundation/Foundation.h> +#include <stddef.h> +#include <stdint.h> #include "base/macros.h" #include "base/synchronization/lock.h" diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.mm b/media/capture/video/mac/video_capture_device_decklink_mac.mm index 9dc9865..5df132d 100644 --- a/media/capture/video/mac/video_capture_device_decklink_mac.mm +++ b/media/capture/video/mac/video_capture_device_decklink_mac.mm @@ -5,6 +5,7 @@ #include "media/capture/video/mac/video_capture_device_decklink_mac.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" diff --git a/media/capture/video/mac/video_capture_device_factory_mac.mm b/media/capture/video/mac/video_capture_device_factory_mac.mm index 573a8b5..2098f3e 100644 --- a/media/capture/video/mac/video_capture_device_factory_mac.mm +++ b/media/capture/video/mac/video_capture_device_factory_mac.mm @@ -5,9 +5,11 @@ #include "media/capture/video/mac/video_capture_device_factory_mac.h" #import <IOKit/audio/IOAudioTypes.h> +#include <stddef.h> #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" #include "base/task_runner_util.h" diff --git a/media/capture/video/mac/video_capture_device_mac.h b/media/capture/video/mac/video_capture_device_mac.h index 1ce41e4..b44dbf9 100644 --- a/media/capture/video/mac/video_capture_device_mac.h +++ b/media/capture/video/mac/video_capture_device_mac.h @@ -11,6 +11,7 @@ #define MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_ #import <Foundation/Foundation.h> +#include <stdint.h> #include <string> diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm index fa8eddd..00e1c00 100644 --- a/media/capture/video/mac/video_capture_device_mac.mm +++ b/media/capture/video/mac/video_capture_device_mac.mm @@ -7,6 +7,7 @@ #include <IOKit/IOCFPlugIn.h> #include <IOKit/usb/IOUSBLib.h> #include <IOKit/usb/USBSpec.h> +#include <stddef.h> #include <stdint.h> #include <limits> @@ -16,6 +17,7 @@ #include "base/logging.h" #include "base/mac/scoped_ioobject.h" #include "base/mac/scoped_ioplugininterface.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" diff --git a/media/capture/video/mac/video_capture_device_qtkit_mac.mm b/media/capture/video/mac/video_capture_device_qtkit_mac.mm index ac11f20..847c61a 100644 --- a/media/capture/video/mac/video_capture_device_qtkit_mac.mm +++ b/media/capture/video/mac/video_capture_device_qtkit_mac.mm @@ -5,6 +5,7 @@ #import "media/capture/video/mac/video_capture_device_qtkit_mac.h" #import <QTKit/QTKit.h> +#include <stddef.h> #include "base/debug/crash_logging.h" #include "base/location.h" diff --git a/media/capture/video/video_capture_device.cc b/media/capture/video/video_capture_device.cc index e7e2c91..d624775 100644 --- a/media/capture/video/video_capture_device.cc +++ b/media/capture/video/video_capture_device.cc @@ -6,7 +6,9 @@ #include "base/command_line.h" #include "base/i18n/timezone.h" +#include "base/macros.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "media/base/media_switches.h" namespace media { diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h index 20e8bcb..2caa669 100644 --- a/media/capture/video/video_capture_device.h +++ b/media/capture/video/video_capture_device.h @@ -12,6 +12,9 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include <string> @@ -21,6 +24,7 @@ #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/media_export.h" #include "media/base/video_capture_types.h" #include "media/base/video_frame.h" diff --git a/media/capture/video/video_capture_device_factory.cc b/media/capture/video/video_capture_device_factory.cc index aa6be6f..9163e27 100644 --- a/media/capture/video/video_capture_device_factory.cc +++ b/media/capture/video/video_capture_device_factory.cc @@ -5,6 +5,7 @@ #include "media/capture/video/video_capture_device_factory.h" #include "base/command_line.h" +#include "build/build_config.h" #include "media/base/media_switches.h" #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index c2c714e..763fa1d 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" @@ -11,6 +14,7 @@ #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "media/base/video_capture_types.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/video_capture_device_factory.h" diff --git a/media/capture/video/win/filter_base_win.h b/media/capture/video/win/filter_base_win.h index ef0f677..20df9ac 100644 --- a/media/capture/video/win/filter_base_win.h +++ b/media/capture/video/win/filter_base_win.h @@ -11,6 +11,7 @@ // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE #include <dshow.h> +#include <stddef.h> #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/capture/video/win/sink_filter_observer_win.h b/media/capture/video/win/sink_filter_observer_win.h index 14a915e..6b74d8f 100644 --- a/media/capture/video/win/sink_filter_observer_win.h +++ b/media/capture/video/win/sink_filter_observer_win.h @@ -8,6 +8,8 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_SINK_FILTER_OBSERVER_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_SINK_FILTER_OBSERVER_WIN_H_ +#include <stdint.h> + namespace media { class SinkFilterObserver { diff --git a/media/capture/video/win/sink_filter_win.h b/media/capture/video/win/sink_filter_win.h index 043f57e..bb3c897 100644 --- a/media/capture/video/win/sink_filter_win.h +++ b/media/capture/video/win/sink_filter_win.h @@ -9,6 +9,7 @@ #define MEDIA_VIDEO_CAPTURE_WIN_SINK_FILTER_WIN_H_ #include <windows.h> +#include <stddef.h> #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/capture/video/win/sink_input_pin_win.cc b/media/capture/video/win/sink_input_pin_win.cc index d0da746..d376dde 100644 --- a/media/capture/video/win/sink_input_pin_win.cc +++ b/media/capture/video/win/sink_input_pin_win.cc @@ -9,8 +9,10 @@ // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE #include <dshow.h> +#include <stdint.h> #include "base/logging.h" +#include "base/macros.h" namespace media { diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc index 1ff42d8..85f68a4 100644 --- a/media/capture/video/win/video_capture_device_factory_win.cc +++ b/media/capture/video/win/video_capture_device_factory_win.cc @@ -6,6 +6,7 @@ #include <mfapi.h> #include <mferror.h> +#include <stddef.h> #include "base/command_line.h" #include "base/macros.h" diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc index 21a1a32..a52463b 100644 --- a/media/capture/video/win/video_capture_device_mf_win.cc +++ b/media/capture/video/win/video_capture_device_mf_win.cc @@ -6,6 +6,7 @@ #include <mfapi.h> #include <mferror.h> +#include <stddef.h> #include "base/location.h" #include "base/memory/ref_counted.h" diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h index 7e21c55..78c1fb0 100644 --- a/media/capture/video/win/video_capture_device_mf_win.h +++ b/media/capture/video/win/video_capture_device_mf_win.h @@ -11,6 +11,7 @@ #include <mfidl.h> #include <mfreadwrite.h> +#include <stdint.h> #include <vector> diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc index aa45c71..44f73ac 100644 --- a/media/capture/video/win/video_capture_device_win.cc +++ b/media/capture/video/win/video_capture_device_win.cc @@ -10,6 +10,7 @@ #include <algorithm> #include <list> +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_variant.h" diff --git a/media/capture/video/win/video_capture_device_win.h b/media/capture/video/win/video_capture_device_win.h index 6a7727f..1e856a2 100644 --- a/media/capture/video/win/video_capture_device_win.h +++ b/media/capture/video/win/video_capture_device_win.h @@ -11,6 +11,7 @@ // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE #include <dshow.h> +#include <stdint.h> #include <map> #include <string> diff --git a/media/capture/webm_muxer.cc b/media/capture/webm_muxer.cc index 3976c0f..44376ce 100644 --- a/media/capture/webm_muxer.cc +++ b/media/capture/webm_muxer.cc @@ -15,7 +15,7 @@ namespace media { namespace { -void WriteOpusHeader(const media::AudioParameters& params, uint8* header) { +void WriteOpusHeader(const media::AudioParameters& params, uint8_t* header) { // See https://wiki.xiph.org/OggOpus#ID_Header. // Set magic signature. std::string label = "OpusHead"; @@ -25,14 +25,14 @@ void WriteOpusHeader(const media::AudioParameters& params, uint8* header) { // Set channel count. header[OPUS_EXTRADATA_CHANNELS_OFFSET] = params.channels(); // Set pre-skip - uint16 skip = 0; - memcpy(header + OPUS_EXTRADATA_SKIP_SAMPLES_OFFSET, &skip, sizeof(uint16)); + uint16_t skip = 0; + memcpy(header + OPUS_EXTRADATA_SKIP_SAMPLES_OFFSET, &skip, sizeof(uint16_t)); // Set original input sample rate in Hz. - uint32 sample_rate = params.sample_rate(); + uint32_t sample_rate = params.sample_rate(); memcpy(header + OPUS_EXTRADATA_SAMPLE_RATE_OFFSET, &sample_rate, - sizeof(uint32)); + sizeof(uint32_t)); // Set output gain in dB. - uint16 gain = 0; + uint16_t gain = 0; memcpy(header + OPUS_EXTRADATA_GAIN_OFFSET, &gain, 2); // Set channel mapping. @@ -217,7 +217,7 @@ void WebmMuxer::AddAudioTrack(const media::AudioParameters& params) { DCHECK_EQ(params.sample_rate(), audio_track->sample_rate()); DCHECK_EQ(params.channels(), static_cast<int>(audio_track->channels())); - uint8 opus_header[OPUS_EXTRADATA_SIZE]; + uint8_t opus_header[OPUS_EXTRADATA_SIZE]; WriteOpusHeader(params, opus_header); if (!audio_track->SetCodecPrivate(opus_header, OPUS_EXTRADATA_SIZE)) diff --git a/media/capture/webm_muxer.h b/media/capture/webm_muxer.h index 4b6b27c..796d8d9 100644 --- a/media/capture/webm_muxer.h +++ b/media/capture/webm_muxer.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_LIBWEBM_MUXER_H_ #define MEDIA_FILTERS_LIBWEBM_MUXER_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/numerics/safe_math.h" diff --git a/media/capture/webm_muxer_unittest.cc b/media/capture/webm_muxer_unittest.cc index a0754b5..b5e59be 100644 --- a/media/capture/webm_muxer_unittest.cc +++ b/media/capture/webm_muxer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/macros.h" diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h index 091ee25..9e5931b 100644 --- a/media/cast/cast_config.h +++ b/media/cast/cast_config.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_CAST_CONFIG_H_ #define MEDIA_CAST_CAST_CONFIG_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/cast/cast_defines.h b/media/cast/cast_defines.h index d839b59..2da7ddc 100644 --- a/media/cast/cast_defines.h +++ b/media/cast/cast_defines.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_CAST_DEFINES_H_ #define MEDIA_CAST_CAST_DEFINES_H_ +#include <stdint.h> + #include "base/time/time.h" namespace media { diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc index 9c6266c..b81fecf 100644 --- a/media/cast/cast_sender_impl.cc +++ b/media/cast/cast_sender_impl.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/video_frame.h" #include "media/cast/sender/video_frame_factory.h" diff --git a/media/cast/common/clock_drift_smoother.cc b/media/cast/common/clock_drift_smoother.cc index 01b7d06a..d2abc90 100644 --- a/media/cast/common/clock_drift_smoother.cc +++ b/media/cast/common/clock_drift_smoother.cc @@ -4,6 +4,8 @@ #include "media/cast/common/clock_drift_smoother.h" +#include <stdint.h> + #include "base/logging.h" namespace media { diff --git a/media/cast/common/transport_encryption_handler.cc b/media/cast/common/transport_encryption_handler.cc index b0b2f96..2082236 100644 --- a/media/cast/common/transport_encryption_handler.cc +++ b/media/cast/common/transport_encryption_handler.cc @@ -4,6 +4,8 @@ #include "media/cast/common/transport_encryption_handler.h" +#include <stddef.h> + #include "base/logging.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" diff --git a/media/cast/common/transport_encryption_handler.h b/media/cast/common/transport_encryption_handler.h index 8ae064d..4dfa884 100644 --- a/media/cast/common/transport_encryption_handler.h +++ b/media/cast/common/transport_encryption_handler.h @@ -6,6 +6,9 @@ #define MEDIA_CAST_COMMON_TRANSPORT_ENCRYPTION_HANDLER_H_ // Helper class to handle encryption for the Cast Transport library. + +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/cast/logging/encoding_event_subscriber.cc b/media/cast/logging/encoding_event_subscriber.cc index a393c22..fa3310d 100644 --- a/media/cast/logging/encoding_event_subscriber.cc +++ b/media/cast/logging/encoding_event_subscriber.cc @@ -4,6 +4,8 @@ #include "media/cast/logging/encoding_event_subscriber.h" +#include <stdint.h> + #include <algorithm> #include <cstring> #include <utility> diff --git a/media/cast/logging/encoding_event_subscriber.h b/media/cast/logging/encoding_event_subscriber.h index 55dbdf3..a6790d0 100644 --- a/media/cast/logging/encoding_event_subscriber.h +++ b/media/cast/logging/encoding_event_subscriber.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_LOGGING_ENCODING_EVENT_SUBSCRIBER_H_ #define MEDIA_CAST_LOGGING_ENCODING_EVENT_SUBSCRIBER_H_ +#include <stddef.h> + #include <map> #include "base/macros.h" diff --git a/media/cast/logging/encoding_event_subscriber_unittest.cc b/media/cast/logging/encoding_event_subscriber_unittest.cc index cfcbb34..0baeee7 100644 --- a/media/cast/logging/encoding_event_subscriber_unittest.cc +++ b/media/cast/logging/encoding_event_subscriber_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/cast/logging/log_deserializer.cc b/media/cast/logging/log_deserializer.cc index 09f74c7..75095ae 100644 --- a/media/cast/logging/log_deserializer.cc +++ b/media/cast/logging/log_deserializer.cc @@ -4,6 +4,8 @@ #include "media/cast/logging/log_deserializer.h" +#include <stdint.h> + #include <utility> #include "base/big_endian.h" diff --git a/media/cast/logging/log_serializer.cc b/media/cast/logging/log_serializer.cc index 732be17..6136518 100644 --- a/media/cast/logging/log_serializer.cc +++ b/media/cast/logging/log_serializer.cc @@ -18,6 +18,8 @@ #include "media/cast/logging/log_serializer.h" +#include <stdint.h> + #include "base/big_endian.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h index 607ff0d..9a8d936 100644 --- a/media/cast/logging/logging_defines.h +++ b/media/cast/logging/logging_defines.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_ #define MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> diff --git a/media/cast/logging/receiver_time_offset_estimator_impl.h b/media/cast/logging/receiver_time_offset_estimator_impl.h index 10260d2..71316e1 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl.h +++ b/media/cast/logging/receiver_time_offset_estimator_impl.h @@ -5,11 +5,14 @@ #ifndef MEDIA_CAST_LOGGING_RECEIVER_TIME_OFFSET_ESTIMATOR_IMPL_H_ #define MEDIA_CAST_LOGGING_RECEIVER_TIME_OFFSET_ESTIMATOR_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/macros.h" -#include "base/time/time.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/cast/common/mod_util.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/logging/receiver_time_offset_estimator.h" diff --git a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc index eab8ff3..7cff1f01 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc +++ b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/cast/logging/serialize_deserialize_test.cc b/media/cast/logging/serialize_deserialize_test.cc index aa4ba1d..9978286 100644 --- a/media/cast/logging/serialize_deserialize_test.cc +++ b/media/cast/logging/serialize_deserialize_test.cc @@ -5,6 +5,9 @@ // Joint LogSerializer and LogDeserializer testing to make sure they stay in // sync. +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/cast/logging/log_deserializer.h" #include "media/cast/logging/log_serializer.h" diff --git a/media/cast/logging/stats_event_subscriber.h b/media/cast/logging/stats_event_subscriber.h index e8cdb94..d1d97be 100644 --- a/media/cast/logging/stats_event_subscriber.h +++ b/media/cast/logging/stats_event_subscriber.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_ #define MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/memory/linked_ptr.h" diff --git a/media/cast/logging/stats_event_subscriber_unittest.cc b/media/cast/logging/stats_event_subscriber_unittest.cc index 0cec20f..6416ae6 100644 --- a/media/cast/logging/stats_event_subscriber_unittest.cc +++ b/media/cast/logging/stats_event_subscriber_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" diff --git a/media/cast/net/cast_transport_config.h b/media/cast/net/cast_transport_config.h index eb3cac6..187eb41 100644 --- a/media/cast/net/cast_transport_config.h +++ b/media/cast/net/cast_transport_config.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ #define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/callback.h" diff --git a/media/cast/net/cast_transport_defines.h b/media/cast/net/cast_transport_defines.h index 2cf015a..9a4d0b2 100644 --- a/media/cast/net/cast_transport_defines.h +++ b/media/cast/net/cast_transport_defines.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_DEFINES_H_ #define MEDIA_CAST_NET_CAST_TRANSPORT_DEFINES_H_ +#include <stddef.h> #include <stdint.h> #include <map> diff --git a/media/cast/net/cast_transport_sender.h b/media/cast/net/cast_transport_sender.h index 5988928..0bc09dd 100644 --- a/media/cast/net/cast_transport_sender.h +++ b/media/cast/net/cast_transport_sender.h @@ -18,6 +18,8 @@ #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_SENDER_H_ #define MEDIA_CAST_NET_CAST_TRANSPORT_SENDER_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/media/cast/net/cast_transport_sender_impl.cc b/media/cast/net/cast_transport_sender_impl.cc index 10646ee..fb32d50 100644 --- a/media/cast/net/cast_transport_sender_impl.cc +++ b/media/cast/net/cast_transport_sender_impl.cc @@ -4,8 +4,11 @@ #include "media/cast/net/cast_transport_sender_impl.h" +#include <stddef.h> + #include "base/single_thread_task_runner.h" #include "base/values.h" +#include "build/build_config.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/udp_transport.h" #include "net/base/net_errors.h" diff --git a/media/cast/net/cast_transport_sender_impl.h b/media/cast/net/cast_transport_sender_impl.h index 16c51fe..5bbc867 100644 --- a/media/cast/net/cast_transport_sender_impl.h +++ b/media/cast/net/cast_transport_sender_impl.h @@ -24,6 +24,8 @@ #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_SENDER_IMPL_H_ #define MEDIA_CAST_NET_CAST_TRANSPORT_SENDER_IMPL_H_ +#include <stdint.h> + #include <set> #include <vector> diff --git a/media/cast/net/cast_transport_sender_impl_unittest.cc b/media/cast/net/cast_transport_sender_impl_unittest.cc index bd795be..685818c 100644 --- a/media/cast/net/cast_transport_sender_impl_unittest.cc +++ b/media/cast/net/cast_transport_sender_impl_unittest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "base/values.h" diff --git a/media/cast/net/frame_id_wrap_helper_test.cc b/media/cast/net/frame_id_wrap_helper_test.cc index 5ffeb22..64e1dbc 100644 --- a/media/cast/net/frame_id_wrap_helper_test.cc +++ b/media/cast/net/frame_id_wrap_helper_test.cc @@ -3,6 +3,9 @@ // found in the LICENSE file. #include <gtest/gtest.h> +#include <stdint.h> + +#include "base/macros.h" #include "media/cast/constants.h" #include "media/cast/net/cast_transport_defines.h" diff --git a/media/cast/net/mock_cast_transport_sender.h b/media/cast/net/mock_cast_transport_sender.h index 5eee66c..1fd4b57 100644 --- a/media/cast/net/mock_cast_transport_sender.h +++ b/media/cast/net/mock_cast_transport_sender.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_NET_MOCK_CAST_TRANSPORT_SENDER_H_ #define MEDIA_CAST_NET_MOCK_CAST_TRANSPORT_SENDER_H_ +#include <stdint.h> + #include "media/cast/net/cast_transport_sender.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/cast/net/pacing/paced_sender.h b/media/cast/net/pacing/paced_sender.h index 11dedb1..4bc1f0b 100644 --- a/media/cast/net/pacing/paced_sender.h +++ b/media/cast/net/pacing/paced_sender.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_PACING_PACED_SENDER_H_ #define MEDIA_CAST_NET_PACING_PACED_SENDER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <tuple> #include <vector> diff --git a/media/cast/net/pacing/paced_sender_unittest.cc b/media/cast/net/pacing/paced_sender_unittest.cc index b11625d..78d8a1c 100644 --- a/media/cast/net/pacing/paced_sender_unittest.cc +++ b/media/cast/net/pacing/paced_sender_unittest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include "base/big_endian.h" +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/net/pacing/paced_sender.h" #include "media/cast/test/fake_single_thread_task_runner.h" diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h index 0f4a4b2..4e82f0a 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_RTCP_RECEIVER_RTCP_EVENT_SUBSCRIBER_H_ #define MEDIA_CAST_RTCP_RECEIVER_RTCP_EVENT_SUBSCRIBER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <vector> diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc index 7797da3..f725714 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/cast/net/rtcp/rtcp.h b/media/cast/net/rtcp/rtcp.h index 4780a9f..00b9ac9 100644 --- a/media/cast/net/rtcp/rtcp.h +++ b/media/cast/net/rtcp/rtcp.h @@ -8,6 +8,7 @@ #ifndef MEDIA_CAST_RTCP_RTCP_H_ #define MEDIA_CAST_RTCP_RTCP_H_ +#include <stddef.h> #include <stdint.h> #include <map> diff --git a/media/cast/net/rtcp/rtcp_builder.h b/media/cast/net/rtcp/rtcp_builder.h index 6ec4eb3..c985343 100644 --- a/media/cast/net/rtcp/rtcp_builder.h +++ b/media/cast/net/rtcp/rtcp_builder.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTCP_RTCP_BUILDER_H_ #define MEDIA_CAST_NET_RTCP_RTCP_BUILDER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <list> #include <string> diff --git a/media/cast/net/rtcp/rtcp_builder_unittest.cc b/media/cast/net/rtcp/rtcp_builder_unittest.cc index 3ed5294..b430e71 100644 --- a/media/cast/net/rtcp/rtcp_builder_unittest.cc +++ b/media/cast/net/rtcp/rtcp_builder_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h index 032383a..49ac004 100644 --- a/media/cast/net/rtcp/rtcp_defines.h +++ b/media/cast/net/rtcp/rtcp_defines.h @@ -5,9 +5,13 @@ #ifndef MEDIA_CAST_RTCP_RTCP_DEFINES_H_ #define MEDIA_CAST_RTCP_RTCP_DEFINES_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/net/cast_transport_defines.h" diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc index 7b85391..f416f24 100644 --- a/media/cast/net/rtcp/rtcp_unittest.cc +++ b/media/cast/net/rtcp/rtcp_unittest.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/pacing/paced_sender.h" diff --git a/media/cast/net/rtcp/rtcp_utility.h b/media/cast/net/rtcp/rtcp_utility.h index 3371d05..0813bc9 100644 --- a/media/cast/net/rtcp/rtcp_utility.h +++ b/media/cast/net/rtcp/rtcp_utility.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_RTCP_RTCP_UTILITY_H_ #define MEDIA_CAST_RTCP_RTCP_UTILITY_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/big_endian.h" #include "base/macros.h" #include "media/cast/logging/logging_defines.h" diff --git a/media/cast/net/rtcp/rtcp_utility_unittest.cc b/media/cast/net/rtcp/rtcp_utility_unittest.cc index ca68176..66abc9a 100644 --- a/media/cast/net/rtcp/rtcp_utility_unittest.cc +++ b/media/cast/net/rtcp/rtcp_utility_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/cast_environment.h" diff --git a/media/cast/net/rtcp/test_rtcp_packet_builder.h b/media/cast/net/rtcp/test_rtcp_packet_builder.h index ae76b3b..9e684f6 100644 --- a/media/cast/net/rtcp/test_rtcp_packet_builder.h +++ b/media/cast/net/rtcp/test_rtcp_packet_builder.h @@ -7,6 +7,8 @@ #ifndef MEDIA_CAST_RTCP_TEST_RTCP_PACKET_BUILDER_H_ #define MEDIA_CAST_RTCP_TEST_RTCP_PACKET_BUILDER_H_ +#include <stdint.h> + #include "base/big_endian.h" #include "base/macros.h" #include "media/cast/net/cast_transport_defines.h" diff --git a/media/cast/net/rtp/cast_message_builder.h b/media/cast/net/rtp/cast_message_builder.h index 2e6531c..487b13f 100644 --- a/media/cast/net/rtp/cast_message_builder.h +++ b/media/cast/net/rtp/cast_message_builder.h @@ -7,6 +7,8 @@ #ifndef MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_ #define MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_ +#include <stdint.h> + #include <deque> #include <map> diff --git a/media/cast/net/rtp/cast_message_builder_unittest.cc b/media/cast/net/rtp/cast_message_builder_unittest.cc index 730ecf8..25ec491 100644 --- a/media/cast/net/rtp/cast_message_builder_unittest.cc +++ b/media/cast/net/rtp/cast_message_builder_unittest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/net/rtcp/rtcp.h" diff --git a/media/cast/net/rtp/frame_buffer.h b/media/cast/net/rtp/frame_buffer.h index 62d21c2..aa441ee 100644 --- a/media/cast/net/rtp/frame_buffer.h +++ b/media/cast/net/rtp/frame_buffer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTP_FRAME_BUFFER_H_ #define MEDIA_CAST_NET_RTP_FRAME_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> diff --git a/media/cast/net/rtp/frame_buffer_unittest.cc b/media/cast/net/rtp/frame_buffer_unittest.cc index c910918..cb3f416 100644 --- a/media/cast/net/rtp/frame_buffer_unittest.cc +++ b/media/cast/net/rtp/frame_buffer_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/cast/net/rtp/frame_buffer.h" +#include <stdint.h> + +#include "base/macros.h" #include "media/cast/net/cast_transport_defines.h" +#include "media/cast/net/rtp/frame_buffer.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/cast/net/rtp/framer.h b/media/cast/net/rtp/framer.h index 246ea2e..cf09400 100644 --- a/media/cast/net/rtp/framer.h +++ b/media/cast/net/rtp/framer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTP_FRAMER_H_ #define MEDIA_CAST_NET_RTP_FRAMER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/macros.h" diff --git a/media/cast/net/rtp/framer_unittest.cc b/media/cast/net/rtp/framer_unittest.cc index feed3ab..4b7f9ef 100644 --- a/media/cast/net/rtp/framer_unittest.cc +++ b/media/cast/net/rtp/framer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/rtp/framer.h" diff --git a/media/cast/net/rtp/mock_rtp_feedback.h b/media/cast/net/rtp/mock_rtp_feedback.h index b5a3a68..0bb21b8 100644 --- a/media/cast/net/rtp/mock_rtp_feedback.h +++ b/media/cast/net/rtp/mock_rtp_feedback.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_NET_RTP_MOCK_RTP_FEEDBACK_H_ #define MEDIA_CAST_NET_RTP_MOCK_RTP_FEEDBACK_H_ +#include <stdint.h> + #include "media/cast/net/rtp/rtp_parser/rtp_feedback.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/cast/net/rtp/packet_storage.h b/media/cast/net/rtp/packet_storage.h index 7c8c9b4..7f85db3 100644 --- a/media/cast/net/rtp/packet_storage.h +++ b/media/cast/net/rtp/packet_storage.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTP_SENDER_PACKET_STORAGE_PACKET_STORAGE_H_ #define MEDIA_CAST_NET_RTP_SENDER_PACKET_STORAGE_PACKET_STORAGE_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include "base/macros.h" diff --git a/media/cast/net/rtp/packet_storage_unittest.cc b/media/cast/net/rtp/packet_storage_unittest.cc index 29fc415..380a450 100644 --- a/media/cast/net/rtp/packet_storage_unittest.cc +++ b/media/cast/net/rtp/packet_storage_unittest.cc @@ -4,6 +4,7 @@ #include "media/cast/net/rtp/packet_storage.h" +#include <stddef.h> #include <stdint.h> #include <algorithm> diff --git a/media/cast/net/rtp/receiver_stats.h b/media/cast/net/rtp/receiver_stats.h index bd2f056..817c2da 100644 --- a/media/cast/net/rtp/receiver_stats.h +++ b/media/cast/net/rtp/receiver_stats.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_NET_RTP_RECEIVER_STATS_H_ #define MEDIA_CAST_NET_RTP_RECEIVER_STATS_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/time/tick_clock.h" #include "base/time/time.h" diff --git a/media/cast/net/rtp/receiver_stats_unittest.cc b/media/cast/net/rtp/receiver_stats_unittest.cc index a62d95c..76d4e91 100644 --- a/media/cast/net/rtp/receiver_stats_unittest.cc +++ b/media/cast/net/rtp/receiver_stats_unittest.cc @@ -6,6 +6,7 @@ #include <stdint.h> +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" #include "media/cast/net/rtp/receiver_stats.h" diff --git a/media/cast/net/rtp/rtp_defines.h b/media/cast/net/rtp/rtp_defines.h index 719fdf4..3eee54e 100644 --- a/media/cast/net/rtp/rtp_defines.h +++ b/media/cast/net/rtp/rtp_defines.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_DEFINES_H_ #define MEDIA_CAST_NET_RTP_RTP_DEFINES_H_ +#include <stdint.h> + #include "media/cast/net/rtcp/rtcp_defines.h" namespace media { diff --git a/media/cast/net/rtp/rtp_packet_builder.h b/media/cast/net/rtp/rtp_packet_builder.h index a7714ba..3f864a4 100644 --- a/media/cast/net/rtp/rtp_packet_builder.h +++ b/media/cast/net/rtp/rtp_packet_builder.h @@ -7,6 +7,8 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_ #define MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/rtp_packetizer.h b/media/cast/net/rtp/rtp_packetizer.h index e69a80c..e60de36 100644 --- a/media/cast/net/rtp/rtp_packetizer.h +++ b/media/cast/net/rtp/rtp_packetizer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_PACKETIZER_H_ #define MEDIA_CAST_NET_RTP_RTP_PACKETIZER_H_ +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include <list> #include <map> diff --git a/media/cast/net/rtp/rtp_packetizer_unittest.cc b/media/cast/net/rtp/rtp_packetizer_unittest.cc index 29afb09..e15647e 100644 --- a/media/cast/net/rtp/rtp_packetizer_unittest.cc +++ b/media/cast/net/rtp/rtp_packetizer_unittest.cc @@ -4,8 +4,10 @@ #include "media/cast/net/rtp/rtp_packetizer.h" +#include <stddef.h> #include <stdint.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/net/pacing/paced_sender.h" diff --git a/media/cast/net/rtp/rtp_parser.h b/media/cast/net/rtp/rtp_parser.h index db07755..f86a285 100644 --- a/media/cast/net/rtp/rtp_parser.h +++ b/media/cast/net/rtp/rtp_parser.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_PARSER_H_ #define MEDIA_CAST_NET_RTP_RTP_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "media/cast/net/cast_transport_defines.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/rtp_parser_unittest.cc b/media/cast/net/rtp/rtp_parser_unittest.cc index 4109edf..4b72a6b 100644 --- a/media/cast/net/rtp/rtp_parser_unittest.cc +++ b/media/cast/net/rtp/rtp_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" #include "media/cast/net/rtp/rtp_defines.h" diff --git a/media/cast/net/rtp/rtp_sender.h b/media/cast/net/rtp/rtp_sender.h index 71c2c4c..ac59c2f 100644 --- a/media/cast/net/rtp/rtp_sender.h +++ b/media/cast/net/rtp/rtp_sender.h @@ -7,6 +7,9 @@ #ifndef MEDIA_CAST_NET_RTP_RTP_SENDER_H_ #define MEDIA_CAST_NET_RTP_RTP_SENDER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> diff --git a/media/cast/net/udp_transport.cc b/media/cast/net/udp_transport.cc index 89d2927..316d4ff 100644 --- a/media/cast/net/udp_transport.cc +++ b/media/cast/net/udp_transport.cc @@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/rand_util.h" +#include "build/build_config.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/rand_callback.h" diff --git a/media/cast/net/udp_transport.h b/media/cast/net/udp_transport.h index ee66206..6da6ae3 100644 --- a/media/cast/net/udp_transport.h +++ b/media/cast/net/udp_transport.h @@ -5,10 +5,13 @@ #ifndef MEDIA_CAST_NET_UDP_TRANSPORT_H_ #define MEDIA_CAST_NET_UDP_TRANSPORT_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "media/cast/cast_environment.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/cast_transport_sender.h" diff --git a/media/cast/net/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc index b0b32a4..63f1043 100644 --- a/media/cast/net/udp_transport_unittest.cc +++ b/media/cast/net/udp_transport_unittest.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "media/cast/net/cast_transport_config.h" diff --git a/media/cast/receiver/audio_decoder.cc b/media/cast/receiver/audio_decoder.cc index 2f04d5f..be3f57c 100644 --- a/media/cast/receiver/audio_decoder.cc +++ b/media/cast/receiver/audio_decoder.cc @@ -4,11 +4,15 @@ #include "media/cast/receiver/audio_decoder.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sys_byteorder.h" +#include "build/build_config.h" #include "third_party/opus/src/include/opus.h" namespace media { diff --git a/media/cast/receiver/audio_decoder_unittest.cc b/media/cast/receiver/audio_decoder_unittest.cc index 48dfab6..74369b7 100644 --- a/media/cast/receiver/audio_decoder_unittest.cc +++ b/media/cast/receiver/audio_decoder_unittest.cc @@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/sys_byteorder.h" diff --git a/media/cast/receiver/cast_receiver_impl.cc b/media/cast/receiver/cast_receiver_impl.cc index c9aeefb..d19479f 100644 --- a/media/cast/receiver/cast_receiver_impl.cc +++ b/media/cast/receiver/cast_receiver_impl.cc @@ -4,6 +4,8 @@ #include "media/cast/receiver/cast_receiver_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" diff --git a/media/cast/receiver/cast_receiver_impl.h b/media/cast/receiver/cast_receiver_impl.h index ca2b765..e836669 100644 --- a/media/cast/receiver/cast_receiver_impl.h +++ b/media/cast/receiver/cast_receiver_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_RECEIVER_CAST_RECEIVER_IMPL_H_ #define MEDIA_CAST_RECEIVER_CAST_RECEIVER_IMPL_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cast/receiver/frame_receiver.h b/media/cast/receiver/frame_receiver.h index 1d89d22..f721ffb 100644 --- a/media/cast/receiver/frame_receiver.h +++ b/media/cast/receiver/frame_receiver.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_ #define MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include "base/macros.h" diff --git a/media/cast/receiver/frame_receiver_unittest.cc b/media/cast/receiver/frame_receiver_unittest.cc index 6386631..5db3ec9 100644 --- a/media/cast/receiver/frame_receiver_unittest.cc +++ b/media/cast/receiver/frame_receiver_unittest.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index 96ec359..c875160 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -4,11 +4,14 @@ #include "media/cast/receiver/video_decoder.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/values.h" #include "media/base/video_frame_pool.h" #include "media/base/video_util.h" diff --git a/media/cast/receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc index 6cb3d49..19ebb9b 100644 --- a/media/cast/receiver/video_decoder_unittest.cc +++ b/media/cast/receiver/video_decoder_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <cstdlib> #include <vector> #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/time/time.h" diff --git a/media/cast/sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc index aaf84d1..3c5740c 100644 --- a/media/cast/sender/audio_encoder.cc +++ b/media/cast/sender/audio_encoder.cc @@ -4,6 +4,8 @@ #include "media/cast/sender/audio_encoder.h" +#include <stdint.h> + #include <algorithm> #include <limits> #include <string> @@ -11,10 +13,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/sys_byteorder.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #if !defined(OS_IOS) #include "third_party/opus/src/include/opus.h" diff --git a/media/cast/sender/audio_encoder_unittest.cc b/media/cast/sender/audio_encoder_unittest.cc index b96a553..6bdffe6 100644 --- a/media/cast/sender/audio_encoder_unittest.cc +++ b/media/cast/sender/audio_encoder_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <sstream> @@ -9,7 +10,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "media/base/audio_bus.h" #include "media/base/media.h" #include "media/cast/cast_config.h" diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc index f866b51..21fd266 100644 --- a/media/cast/sender/audio_sender_unittest.cc +++ b/media/cast/sender/audio_sender_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "base/values.h" diff --git a/media/cast/sender/congestion_control.cc b/media/cast/sender/congestion_control.cc index c5b91f5..4168116 100644 --- a/media/cast/sender/congestion_control.cc +++ b/media/cast/sender/congestion_control.cc @@ -19,6 +19,7 @@ #include <deque> #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "media/cast/cast_defines.h" #include "media/cast/constants.h" diff --git a/media/cast/sender/congestion_control.h b/media/cast/sender/congestion_control.h index 3951f99..1311aa5 100644 --- a/media/cast/sender/congestion_control.h +++ b/media/cast/sender/congestion_control.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_CONGESTION_CONTROL_CONGESTION_CONTROL_H_ #define MEDIA_CAST_CONGESTION_CONTROL_CONGESTION_CONTROL_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "base/time/tick_clock.h" #include "base/time/time.h" diff --git a/media/cast/sender/congestion_control_unittest.cc b/media/cast/sender/congestion_control_unittest.cc index e1c0251..c1b8ae1 100644 --- a/media/cast/sender/congestion_control_unittest.cc +++ b/media/cast/sender/congestion_control_unittest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include "base/bind.h" +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "media/cast/sender/congestion_control.h" #include "media/cast/test/fake_single_thread_task_runner.h" diff --git a/media/cast/sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc index f716a55..0bfbe71 100644 --- a/media/cast/sender/external_video_encoder.cc +++ b/media/cast/sender/external_video_encoder.cc @@ -11,11 +11,13 @@ #include "base/debug/dump_without_crashing.h" #include "base/format_macros.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "media/base/video_frame.h" #include "media/base/video_types.h" #include "media/base/video_util.h" diff --git a/media/cast/sender/external_video_encoder.h b/media/cast/sender/external_video_encoder.h index e935107..ad33f8a 100644 --- a/media/cast/sender/external_video_encoder.h +++ b/media/cast/sender/external_video_encoder.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_ #define MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/cast/sender/external_video_encoder_unittest.cc b/media/cast/sender/external_video_encoder_unittest.cc index 1004ba5..805eb03 100644 --- a/media/cast/sender/external_video_encoder_unittest.cc +++ b/media/cast/sender/external_video_encoder_unittest.cc @@ -4,6 +4,8 @@ #include "media/cast/sender/external_video_encoder.h" +#include <stdint.h> + #include "media/base/video_frame.h" #include "media/base/video_types.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/cast/sender/fake_software_video_encoder.cc b/media/cast/sender/fake_software_video_encoder.cc index 57fe249..9be0669 100644 --- a/media/cast/sender/fake_software_video_encoder.cc +++ b/media/cast/sender/fake_software_video_encoder.cc @@ -4,6 +4,8 @@ #include "media/cast/sender/fake_software_video_encoder.h" +#include <stddef.h> + #include "base/json/json_writer.h" #include "base/values.h" #include "media/base/video_frame.h" diff --git a/media/cast/sender/fake_software_video_encoder.h b/media/cast/sender/fake_software_video_encoder.h index d6a6f54..c612497 100644 --- a/media/cast/sender/fake_software_video_encoder.h +++ b/media/cast/sender/fake_software_video_encoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_FAKE_SOFTWARE_VIDEO_ENCODER_H_ #define MEDIA_CAST_SENDER_FAKE_SOFTWARE_VIDEO_ENCODER_H_ +#include <stdint.h> + #include "media/cast/cast_config.h" #include "media/cast/sender/software_video_encoder.h" #include "ui/gfx/geometry/size.h" diff --git a/media/cast/sender/fake_video_encode_accelerator_factory.h b/media/cast/sender/fake_video_encode_accelerator_factory.h index 6048271..faa74a2 100644 --- a/media/cast/sender/fake_video_encode_accelerator_factory.h +++ b/media/cast/sender/fake_video_encode_accelerator_factory.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_FAKE_VIDEO_ENCODE_ACCELERATOR_FACTORY_H_ #define MEDIA_CAST_SENDER_FAKE_VIDEO_ENCODE_ACCELERATOR_FACTORY_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/cast/sender/frame_sender.cc b/media/cast/sender/frame_sender.cc index 1101bf1..8303483 100644 --- a/media/cast/sender/frame_sender.cc +++ b/media/cast/sender/frame_sender.cc @@ -8,6 +8,7 @@ #include <limits> #include <vector> +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "media/cast/cast_defines.h" #include "media/cast/constants.h" diff --git a/media/cast/sender/h264_vt_encoder.cc b/media/cast/sender/h264_vt_encoder.cc index 30f968f..c21cfcc6 100644 --- a/media/cast/sender/h264_vt_encoder.cc +++ b/media/cast/sender/h264_vt_encoder.cc @@ -4,6 +4,8 @@ #include "media/cast/sender/h264_vt_encoder.h" +#include <stddef.h> + #include <string> #include <vector> @@ -15,6 +17,7 @@ #include "base/macros.h" #include "base/power_monitor/power_monitor.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" #include "media/base/mac/corevideo_glue.h" #include "media/base/mac/video_frame_mac.h" #include "media/cast/cast_defines.h" diff --git a/media/cast/sender/h264_vt_encoder.h b/media/cast/sender/h264_vt_encoder.h index 1769b31..c3b414d 100644 --- a/media/cast/sender/h264_vt_encoder.h +++ b/media/cast/sender/h264_vt_encoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_H264_VT_ENCODER_H_ #define MEDIA_CAST_SENDER_H264_VT_ENCODER_H_ +#include <stdint.h> + #include "base/mac/scoped_cftyperef.h" #include "base/macros.h" #include "base/power_monitor/power_observer.h" diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc index fac070d..029a483 100644 --- a/media/cast/sender/h264_vt_encoder_unittest.cc +++ b/media/cast/sender/h264_vt_encoder_unittest.cc @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <queue> #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/power_monitor/power_monitor.h" #include "base/test/launcher/unit_test_launcher.h" diff --git a/media/cast/sender/performance_metrics_overlay.cc b/media/cast/sender/performance_metrics_overlay.cc index dfa2f21..bdbfa69 100644 --- a/media/cast/sender/performance_metrics_overlay.cc +++ b/media/cast/sender/performance_metrics_overlay.cc @@ -4,6 +4,9 @@ #include "media/cast/sender/performance_metrics_overlay.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> diff --git a/media/cast/sender/size_adaptable_video_encoder_base.h b/media/cast/sender/size_adaptable_video_encoder_base.h index e6a5230..b12119f 100644 --- a/media/cast/sender/size_adaptable_video_encoder_base.h +++ b/media/cast/sender/size_adaptable_video_encoder_base.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_SIZE_ADAPTABLE_VIDEO_ENCODER_BASE_H_ #define MEDIA_CAST_SENDER_SIZE_ADAPTABLE_VIDEO_ENCODER_BASE_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cast/sender/software_video_encoder.h b/media/cast/sender/software_video_encoder.h index acf96e3..c39028d 100644 --- a/media/cast/sender/software_video_encoder.h +++ b/media/cast/sender/software_video_encoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_SOFTWARE_VIDEO_ENCODER_H_ #define MEDIA_CAST_SENDER_SOFTWARE_VIDEO_ENCODER_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "media/cast/sender/sender_encoded_frame.h" diff --git a/media/cast/sender/video_encoder.cc b/media/cast/sender/video_encoder.cc index 33c15c4..964a6c5 100644 --- a/media/cast/sender/video_encoder.cc +++ b/media/cast/sender/video_encoder.cc @@ -4,6 +4,7 @@ #include "media/cast/sender/video_encoder.h" +#include "build/build_config.h" #include "media/cast/sender/external_video_encoder.h" #include "media/cast/sender/video_encoder_impl.h" diff --git a/media/cast/sender/video_encoder_unittest.cc b/media/cast/sender/video_encoder_unittest.cc index 63f694e..487c140 100644 --- a/media/cast/sender/video_encoder_unittest.cc +++ b/media/cast/sender/video_encoder_unittest.cc @@ -2,18 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <vector> +#include <stdint.h> + #include <utility> +#include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "media/base/video_frame.h" #include "media/cast/cast_defines.h" #include "media/cast/cast_environment.h" #include "media/cast/sender/fake_video_encode_accelerator_factory.h" -#include "media/cast/sender/video_frame_factory.h" #include "media/cast/sender/video_encoder.h" +#include "media/cast/sender/video_frame_factory.h" #include "media/cast/test/fake_single_thread_task_runner.h" #include "media/cast/test/utility/default_config.h" #include "media/cast/test/utility/video_utility.h" diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc index 0209962..0f1d556 100644 --- a/media/cast/sender/video_sender.cc +++ b/media/cast/sender/video_sender.cc @@ -4,6 +4,8 @@ #include "media/cast/sender/video_sender.h" +#include <stdint.h> + #include <algorithm> #include <cmath> #include <cstring> diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc index af271da..b4bd086 100644 --- a/media/cast/sender/video_sender_unittest.cc +++ b/media/cast/sender/video_sender_unittest.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/video_frame.h" diff --git a/media/cast/sender/vp8_encoder.h b/media/cast/sender/vp8_encoder.h index 008f658..d8270b2 100644 --- a/media/cast/sender/vp8_encoder.h +++ b/media/cast/sender/vp8_encoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_ #define MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" diff --git a/media/cast/sender/vp8_quantizer_parser.cc b/media/cast/sender/vp8_quantizer_parser.cc index 0646efd..5cbe675 100644 --- a/media/cast/sender/vp8_quantizer_parser.cc +++ b/media/cast/sender/vp8_quantizer_parser.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/cast/sender/vp8_quantizer_parser.h" #include "base/logging.h" +#include "base/macros.h" +#include "media/cast/sender/vp8_quantizer_parser.h" namespace media { namespace cast { diff --git a/media/cast/sender/vp8_quantizer_parser.h b/media/cast/sender/vp8_quantizer_parser.h index 09b222b..9932750 100644 --- a/media/cast/sender/vp8_quantizer_parser.h +++ b/media/cast/sender/vp8_quantizer_parser.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_SENDER_VP8_QUANTIZER_PARSER_H_ #define MEDIA_CAST_SENDER_VP8_QUANTIZER_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include "media/cast/cast_config.h" namespace media { diff --git a/media/cast/sender/vp8_quantizer_parser_unittest.cc b/media/cast/sender/vp8_quantizer_parser_unittest.cc index 1c83cb1..bb033ec 100644 --- a/media/cast/sender/vp8_quantizer_parser_unittest.cc +++ b/media/cast/sender/vp8_quantizer_parser_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <cstdlib> +#include "base/macros.h" #include "base/time/time.h" #include "media/cast/cast_config.h" #include "media/cast/receiver/video_decoder.h" diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc index 81d0263..a867eb2 100644 --- a/media/cast/test/cast_benchmarks.cc +++ b/media/cast/test/cast_benchmarks.cc @@ -22,6 +22,7 @@ // $ pprof ./out/Release/cast_benchmarks $PROFILE_FILE --gv #include <math.h> +#include <stddef.h> #include <stdint.h> #include <map> diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc index 015833d..85b885b 100644 --- a/media/cast/test/end2end_unittest.cc +++ b/media/cast/test/end2end_unittest.cc @@ -10,6 +10,7 @@ // that moves across the screen #include <math.h> +#include <stddef.h> #include <stdint.h> #include <functional> diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h index 427643a..a400cb3 100644 --- a/media/cast/test/fake_media_source.h +++ b/media/cast/test/fake_media_source.h @@ -10,6 +10,8 @@ #ifndef MEDIA_CAST_TEST_FAKE_MEDIA_SOURCE_H_ #define MEDIA_CAST_TEST_FAKE_MEDIA_SOURCE_H_ +#include <stdint.h> + #include <queue> #include "base/files/file_path.h" diff --git a/media/cast/test/linux_output_window.cc b/media/cast/test/linux_output_window.cc index 486db98..ed9347a 100644 --- a/media/cast/test/linux_output_window.cc +++ b/media/cast/test/linux_output_window.cc @@ -4,6 +4,8 @@ #include "media/cast/test/linux_output_window.h" +#include <stdint.h> + #include <algorithm> #include "base/logging.h" diff --git a/media/cast/test/loopback_transport.cc b/media/cast/test/loopback_transport.cc index fe1b78a8..570d0a0 100644 --- a/media/cast/test/loopback_transport.cc +++ b/media/cast/test/loopback_transport.cc @@ -4,6 +4,7 @@ #include "media/cast/test/loopback_transport.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/time/tick_clock.h" #include "media/cast/test/utility/udp_proxy.h" diff --git a/media/cast/test/loopback_transport.h b/media/cast/test/loopback_transport.h index feed238..e61ae4d 100644 --- a/media/cast/test/loopback_transport.h +++ b/media/cast/test/loopback_transport.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_TEST_LOOPBACK_TRANSPORT_H_ #define MEDIA_CAST_TEST_LOOPBACK_TRANSPORT_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc index 94eb86c..826a10d 100644 --- a/media/cast/test/receiver.cc +++ b/media/cast/test/receiver.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <climits> #include <cstdarg> diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc index 6f46222..4eab2a2 100644 --- a/media/cast/test/sender.cc +++ b/media/cast/test/sender.cc @@ -5,6 +5,8 @@ // Test application that simulates a cast sender - Data can be either generated // or read from a file. +#include <stdint.h> + #include <queue> #include "base/at_exit.h" diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc index b486648..896b20d 100644 --- a/media/cast/test/simulator.cc +++ b/media/cast/test/simulator.cc @@ -34,6 +34,9 @@ // - Raw event log of the simulation session tagged with the unique test ID, // written out to the specified file path. +#include <stddef.h> +#include <stdint.h> + #include "base/at_exit.h" #include "base/base_paths.h" #include "base/command_line.h" @@ -43,6 +46,7 @@ #include "base/files/scoped_file.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" diff --git a/media/cast/test/utility/audio_utility.h b/media/cast/test/utility/audio_utility.h index 6b8ae68..d1a4ca0 100644 --- a/media/cast/test/utility/audio_utility.h +++ b/media/cast/test/utility/audio_utility.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_TEST_UTILITY_AUDIO_UTILITY_H_ #define MEDIA_CAST_TEST_UTILITY_AUDIO_UTILITY_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "media/audio/simple_sources.h" diff --git a/media/cast/test/utility/audio_utility_unittest.cc b/media/cast/test/utility/audio_utility_unittest.cc index 47d1ad0..e5d585a 100644 --- a/media/cast/test/utility/audio_utility_unittest.cc +++ b/media/cast/test/utility/audio_utility_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/base/video_frame.h" #include "media/cast/test/utility/audio_utility.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/cast/test/utility/barcode.h b/media/cast/test/utility/barcode.h index 6dbd085..1c38149 100644 --- a/media/cast/test/utility/barcode.h +++ b/media/cast/test/utility/barcode.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_TEST_UTILITY_BARCODE_H_ #define MEDIA_CAST_TEST_UTILITY_BARCODE_H_ +#include <stddef.h> + #include <vector> #include "base/memory/ref_counted.h" diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc index 9101705..7d8b081 100644 --- a/media/cast/test/utility/default_config.cc +++ b/media/cast/test/utility/default_config.cc @@ -4,6 +4,8 @@ #include "media/cast/test/utility/default_config.h" +#include <stddef.h> + #include "base/bind.h" #include "media/cast/cast_config.h" #include "media/cast/constants.h" diff --git a/media/cast/test/utility/generate_barcode_video.cc b/media/cast/test/utility/generate_barcode_video.cc index 774706d..dd46b0b 100644 --- a/media/cast/test/utility/generate_barcode_video.cc +++ b/media/cast/test/utility/generate_barcode_video.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <cstdio> #include <cstdlib> diff --git a/media/cast/test/utility/generate_timecode_audio.cc b/media/cast/test/utility/generate_timecode_audio.cc index 88d3fac..fe374f9 100644 --- a/media/cast/test/utility/generate_timecode_audio.cc +++ b/media/cast/test/utility/generate_timecode_audio.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <algorithm> diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc index 43125f5..c0d8b3a 100644 --- a/media/cast/test/utility/tap_proxy.cc +++ b/media/cast/test/utility/tap_proxy.cc @@ -9,6 +9,8 @@ #include <math.h> #include <net/if.h> #include <netinet/in.h> +#include <stddef.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <sys/ioctl.h> diff --git a/media/cast/test/utility/test_util.h b/media/cast/test/utility/test_util.h index 6420f8c..2b48706 100644 --- a/media/cast/test/utility/test_util.h +++ b/media/cast/test/utility/test_util.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CAST_TEST_UTILITY_TEST_UTIL_H #define MEDIA_CAST_TEST_UTILITY_TEST_UTIL_H +#include <stddef.h> + #include <string> #include <vector> diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index 088ebc9..c5c54e5 100644 --- a/media/cast/test/utility/udp_proxy.cc +++ b/media/cast/test/utility/udp_proxy.cc @@ -9,6 +9,7 @@ #include "media/cast/test/utility/udp_proxy.h" #include "base/logging.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/synchronization/waitable_event.h" #include "base/thread_task_runner_handle.h" diff --git a/media/cast/test/utility/udp_proxy.h b/media/cast/test/utility/udp_proxy.h index 003dce7..ef89c99 100644 --- a/media/cast/test/utility/udp_proxy.h +++ b/media/cast/test/utility/udp_proxy.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CAST_TEST_UTILITY_UDP_PROXY_H_ #define MEDIA_CAST_TEST_UTILITY_UDP_PROXY_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc index 8c2e7cf4..bfa4e48 100644 --- a/media/cast/test/utility/udp_proxy_main.cc +++ b/media/cast/test/utility/udp_proxy_main.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <cstdio> #include <cstdlib> #include <deque> diff --git a/media/cast/test/utility/video_utility.cc b/media/cast/test/utility/video_utility.cc index a63d7cf..db6c958 100644 --- a/media/cast/test/utility/video_utility.cc +++ b/media/cast/test/utility/video_utility.cc @@ -5,6 +5,8 @@ #include "media/cast/test/utility/video_utility.h" #include <math.h> +#include <stddef.h> +#include <stdint.h> #include <cstdio> #include "base/rand_util.h" diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc index 1c3f367..c194adf 100644 --- a/media/cdm/aes_decryptor.cc +++ b/media/cdm/aes_decryptor.cc @@ -4,10 +4,13 @@ #include "media/cdm/aes_decryptor.h" +#include <stddef.h> + #include <list> #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "crypto/encryptor.h" diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h index 59ff4f9..1748ce4 100644 --- a/media/cdm/aes_decryptor.h +++ b/media/cdm/aes_decryptor.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_ #define MEDIA_CRYPTO_AES_DECRYPTOR_H_ +#include <stdint.h> + #include <set> #include <string> #include <vector> diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc index edda82d..90172fd 100644 --- a/media/cdm/aes_decryptor_unittest.cc +++ b/media/cdm/aes_decryptor_unittest.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/debug/leak_annotations.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/values.h" #include "media/base/cdm_callback_promise.h" #include "media/base/cdm_config.h" diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc index 0bce8b5..bdc03ec 100644 --- a/media/cdm/cdm_adapter.cc +++ b/media/cdm/cdm_adapter.cc @@ -4,6 +4,8 @@ #include "media/cdm/cdm_adapter.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h index d76f475..091d775 100644 --- a/media/cdm/cdm_adapter.h +++ b/media/cdm/cdm_adapter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_CDM_ADAPTER_H_ #define MEDIA_CDM_CDM_ADAPTER_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc index bc11ad5..ed23d47 100644 --- a/media/cdm/cdm_adapter_unittest.cc +++ b/media/cdm/cdm_adapter_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "media/base/cdm_callback_promise.h" diff --git a/media/cdm/cdm_buffer_impl.h b/media/cdm/cdm_buffer_impl.h index 017b85c..b3dcb13 100644 --- a/media/cdm/cdm_buffer_impl.h +++ b/media/cdm/cdm_buffer_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_CDM_BUFFER_IMPL_H_ #define MEDIA_CDM_CDM_BUFFER_IMPL_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/cdm/cdm_helpers.h b/media/cdm/cdm_helpers.h index 538b4e8..ea81376 100644 --- a/media/cdm/cdm_helpers.h +++ b/media/cdm/cdm_helpers.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_CDM_HELPERS_H_ #define MEDIA_CDM_CDM_HELPERS_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" diff --git a/media/cdm/cdm_wrapper.h b/media/cdm/cdm_wrapper.h index 156dbf5..f0ed673 100644 --- a/media/cdm/cdm_wrapper.h +++ b/media/cdm/cdm_wrapper.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_CDM_WRAPPER_H_ #define MEDIA_CDM_CDM_WRAPPER_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/cdm/cenc_utils.cc b/media/cdm/cenc_utils.cc index cb7373f..dbb8623 100644 --- a/media/cdm/cenc_utils.cc +++ b/media/cdm/cenc_utils.cc @@ -4,6 +4,7 @@ #include "media/cdm/cenc_utils.h" +#include "base/macros.h" #include "media/formats/mp4/box_definitions.h" #include "media/formats/mp4/box_reader.h" diff --git a/media/cdm/cenc_utils.h b/media/cdm/cenc_utils.h index 17f844e..6f5a827 100644 --- a/media/cdm/cenc_utils.h +++ b/media/cdm/cenc_utils.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_CENC_UTILS_H_ #define MEDIA_CDM_CENC_UTILS_H_ +#include <stdint.h> + #include <vector> #include "media/base/media_export.h" diff --git a/media/cdm/cenc_utils_unittest.cc b/media/cdm/cenc_utils_unittest.cc index ae9316e..beab6ed 100644 --- a/media/cdm/cenc_utils_unittest.cc +++ b/media/cdm/cenc_utils_unittest.cc @@ -4,7 +4,11 @@ #include "media/cdm/cenc_utils.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/cdm/external_clear_key_test_helper.cc b/media/cdm/external_clear_key_test_helper.cc index 450ddaa..1a2a15e 100644 --- a/media/cdm/external_clear_key_test_helper.cc +++ b/media/cdm/external_clear_key_test_helper.cc @@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/path_service.h" +#include "build/build_config.h" #include "media/cdm/api/content_decryption_module.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/cdm/json_web_key.cc b/media/cdm/json_web_key.cc index ded017a..13b5837 100644 --- a/media/cdm/json_web_key.cc +++ b/media/cdm/json_web_key.cc @@ -4,11 +4,14 @@ #include "media/cdm/json_web_key.h" +#include <stddef.h> + #include "base/base64url.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/json/string_escape.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" diff --git a/media/cdm/json_web_key.h b/media/cdm/json_web_key.h index 6e6cd66..abaa7e0 100644 --- a/media/cdm/json_web_key.h +++ b/media/cdm/json_web_key.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_JSON_WEB_KEY_H_ #define MEDIA_CDM_JSON_WEB_KEY_H_ +#include <stdint.h> + #include <string> #include <utility> #include <vector> diff --git a/media/cdm/json_web_key_unittest.cc b/media/cdm/json_web_key_unittest.cc index 2b0baa4..0fd4a82 100644 --- a/media/cdm/json_web_key_unittest.cc +++ b/media/cdm/json_web_key_unittest.cc @@ -4,8 +4,12 @@ #include "media/cdm/json_web_key.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/cdm/ppapi/cdm_file_io_impl.h b/media/cdm/ppapi/cdm_file_io_impl.h index cbb59bd..5d86790 100644 --- a/media/cdm/ppapi/cdm_file_io_impl.h +++ b/media/cdm/ppapi/cdm_file_io_impl.h @@ -5,6 +5,9 @@ #ifndef MEDIA_CDM_PPAPI_CDM_FILE_IO_IMPL_H_ #define MEDIA_CDM_PPAPI_CDM_FILE_IO_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> #include <vector> diff --git a/media/cdm/ppapi/cdm_file_io_test.cc b/media/cdm/ppapi/cdm_file_io_test.cc index 2c7d0ee..539da6f 100644 --- a/media/cdm/ppapi/cdm_file_io_test.cc +++ b/media/cdm/ppapi/cdm_file_io_test.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" namespace media { diff --git a/media/cdm/ppapi/cdm_file_io_test.h b/media/cdm/ppapi/cdm_file_io_test.h index 2c538ce..2536733 100644 --- a/media/cdm/ppapi/cdm_file_io_test.h +++ b/media/cdm/ppapi/cdm_file_io_test.h @@ -5,6 +5,7 @@ #ifndef MEDIA_CDM_PPAPI_CDM_FILE_IO_TEST_H_ #define MEDIA_CDM_PPAPI_CDM_FILE_IO_TEST_H_ +#include <stddef.h> #include <stdint.h> #include <list> diff --git a/media/cdm/ppapi/cdm_logging.cc b/media/cdm/ppapi/cdm_logging.cc index fe50065..5552862 100644 --- a/media/cdm/ppapi/cdm_logging.cc +++ b/media/cdm/ppapi/cdm_logging.cc @@ -26,12 +26,13 @@ #if defined(OS_POSIX) #include <errno.h> #include <pthread.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <unistd.h> #endif +#include <stddef.h> #include <stdint.h> #include <iomanip> diff --git a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h index 410580d..696a290 100644 --- a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_VIDEO_DECODER_H_ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_VIDEO_DECODER_H_ +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "media/cdm/api/content_decryption_module.h" #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc index d214fff..917c5ac 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/base/cdm_callback_promise.h" diff --git a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h index 7e84bfe..3495f5d 100644 --- a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc index 2c82f0a..c0231cd 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc @@ -4,6 +4,8 @@ #include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h index 0ae4bcf..d29a1a7 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ +#include <stdint.h> + #include <vector> #include "base/compiler_specific.h" diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h index 4d0fb23..761a225 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h index 17f7a58..a9d54e1 100644 --- a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_ #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" diff --git a/media/cdm/ppapi/ppapi_cdm_adapter.cc b/media/cdm/ppapi/ppapi_cdm_adapter.cc index e90a2f6..40b0bae 100644 --- a/media/cdm/ppapi/ppapi_cdm_adapter.cc +++ b/media/cdm/ppapi/ppapi_cdm_adapter.cc @@ -4,6 +4,8 @@ #include "media/cdm/ppapi/ppapi_cdm_adapter.h" +#include "base/macros.h" +#include "build/build_config.h" #include "media/base/limits.h" #include "media/cdm/ppapi/cdm_file_io_impl.h" #include "media/cdm/ppapi/cdm_logging.h" diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc index 7bcef96..4aea6b3 100644 --- a/media/cdm/proxy_decryptor.cc +++ b/media/cdm/proxy_decryptor.cc @@ -4,12 +4,16 @@ #include "media/cdm/proxy_decryptor.h" +#include <stddef.h> + #include <cstring> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "media/base/cdm_callback_promise.h" #include "media/base/cdm_config.h" #include "media/base/cdm_factory.h" diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h index 575e14a..ca0d36d 100644 --- a/media/cdm/proxy_decryptor.h +++ b/media/cdm/proxy_decryptor.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_ #define MEDIA_CDM_PROXY_DECRYPTOR_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -14,6 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "media/base/cdm_context.h" #include "media/base/decryptor.h" #include "media/base/eme_constants.h" diff --git a/media/cdm/stub/stub_cdm.h b/media/cdm/stub/stub_cdm.h index 6f9a623..8d7623a 100644 --- a/media/cdm/stub/stub_cdm.h +++ b/media/cdm/stub/stub_cdm.h @@ -5,6 +5,8 @@ #ifndef MEDIA_CDM_STUB_STUB_CDM_H_ #define MEDIA_CDM_STUB_STUB_CDM_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/cdm/api/content_decryption_module.h" diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 88c29b1..3d3a8b8 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -10,6 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "media/base/decoder_buffer.h" #include "media/base/video_decoder_config.h" #include "media/base/video_util.h" diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index df4bab5..55e3ab7 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_ #define MEDIA_FFMPEG_FFMPEG_COMMON_H_ +#include <stdint.h> + // Used for FFmpeg error codes. #include <cerrno> diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc index bc575f9..1d33405 100644 --- a/media/ffmpeg/ffmpeg_common_unittest.cc +++ b/media/ffmpeg/ffmpeg_common_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <cstring> #include "base/bind.h" #include "base/files/memory_mapped_file.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/media.h" diff --git a/media/filters/audio_clock.cc b/media/filters/audio_clock.cc index 29bf14e..80e4509 100644 --- a/media/filters/audio_clock.cc +++ b/media/filters/audio_clock.cc @@ -4,6 +4,8 @@ #include "media/filters/audio_clock.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/media/filters/audio_clock.h b/media/filters/audio_clock.h index 4a92da5..024c791 100644 --- a/media/filters/audio_clock.h +++ b/media/filters/audio_clock.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_AUDIO_CLOCK_H_ #define MEDIA_FILTERS_AUDIO_CLOCK_H_ +#include <stdint.h> + #include <deque> #include "base/macros.h" diff --git a/media/filters/audio_clock_unittest.cc b/media/filters/audio_clock_unittest.cc index 1f61100..303e8e3 100644 --- a/media/filters/audio_clock_unittest.cc +++ b/media/filters/audio_clock_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "media/base/audio_timestamp_helper.h" #include "media/filters/audio_clock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc index 2f5adaa..84b56e6 100644 --- a/media/filters/audio_decoder_selector_unittest.cc +++ b/media/filters/audio_decoder_selector_unittest.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "media/base/gmock_callback_support.h" #include "media/base/media_util.h" #include "media/base/mock_filters.h" diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc index 28bb251..77bacd2 100644 --- a/media/filters/audio_decoder_unittest.cc +++ b/media/filters/audio_decoder_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <vector> #include "base/bind.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/md5.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc index 2cc4059..978f3b7 100644 --- a/media/filters/audio_file_reader.cc +++ b/media/filters/audio_file_reader.cc @@ -4,6 +4,8 @@ #include "media/filters/audio_file_reader.h" +#include <stddef.h> + #include <cmath> #include "base/logging.h" diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc index 1c2f2cd..a560379 100644 --- a/media/filters/audio_file_reader_unittest.cc +++ b/media/filters/audio_file_reader_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" diff --git a/media/filters/audio_renderer_algorithm.h b/media/filters/audio_renderer_algorithm.h index 9192f39..1cd0e91 100644 --- a/media/filters/audio_renderer_algorithm.h +++ b/media/filters/audio_renderer_algorithm.h @@ -21,6 +21,8 @@ #ifndef MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_ #define MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc index 37320b8..206491d 100644 --- a/media/filters/audio_renderer_algorithm_unittest.cc +++ b/media/filters/audio_renderer_algorithm_unittest.cc @@ -8,12 +8,16 @@ // correct rate. We always pass in a very large destination buffer with the // expectation that FillBuffer() will fill as much as it can but no more. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> // For std::min(). #include <cmath> #include <vector> #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" diff --git a/media/filters/blocking_url_protocol.cc b/media/filters/blocking_url_protocol.cc index 6dffacc..96f35b1 100644 --- a/media/filters/blocking_url_protocol.cc +++ b/media/filters/blocking_url_protocol.cc @@ -4,7 +4,10 @@ #include "media/filters/blocking_url_protocol.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "media/base/data_source.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/blocking_url_protocol.h b/media/filters/blocking_url_protocol.h index 2ff5b9c3..4f9ef4f 100644 --- a/media/filters/blocking_url_protocol.h +++ b/media/filters/blocking_url_protocol.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_BLOCKING_URL_PROTOCOL_H_ #define MEDIA_FILTERS_BLOCKING_URL_PROTOCOL_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/synchronization/waitable_event.h" diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc index aed79c4..266f893 100644 --- a/media/filters/blocking_url_protocol_unittest.cc +++ b/media/filters/blocking_url_protocol_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "media/base/test_data_util.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc index b96b039..bef4b3c 100644 --- a/media/filters/chunk_demuxer.cc +++ b/media/filters/chunk_demuxer.cc @@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/stl_util.h" #include "media/base/audio_decoder_config.h" #include "media/base/bind_to_current_loop.h" diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h index b5d416b..d07caab 100644 --- a/media/filters/chunk_demuxer.h +++ b/media/filters/chunk_demuxer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_ #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <map> #include <string> diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index 60b0700..75cba6c 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc @@ -2,9 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc index 4d06d9c..c13fc0d 100644 --- a/media/filters/decoder_selector.cc +++ b/media/filters/decoder_selector.cc @@ -8,6 +8,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" +#include "build/build_config.h" #include "media/base/audio_decoder.h" #include "media/base/bind_to_current_loop.h" #include "media/base/demuxer_stream.h" diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h index 4e7af7c..d0da924 100644 --- a/media/filters/decoder_selector.h +++ b/media/filters/decoder_selector.h @@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "media/base/cdm_context.h" #include "media/base/demuxer_stream.h" #include "media/base/pipeline_status.h" diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc index a655782..60586a8 100644 --- a/media/filters/decrypting_audio_decoder.cc +++ b/media/filters/decrypting_audio_decoder.cc @@ -4,6 +4,8 @@ #include "media/filters/decrypting_audio_decoder.h" +#include <stdint.h> + #include <cstdlib> #include "base/bind.h" diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc index c3c44c6..4f446b4 100644 --- a/media/filters/decrypting_audio_decoder_unittest.cc +++ b/media/filters/decrypting_audio_decoder_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/audio_buffer.h" #include "media/base/decoder_buffer.h" diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc index 5efc590..92aafe3 100644 --- a/media/filters/decrypting_demuxer_stream_unittest.cc +++ b/media/filters/decrypting_demuxer_stream_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/decrypt_config.h" diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h index 860f78f..bdcc34f 100644 --- a/media/filters/decrypting_video_decoder.h +++ b/media/filters/decrypting_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc index 730da67..23ef9b9 100644 --- a/media/filters/decrypting_video_decoder_unittest.cc +++ b/media/filters/decrypting_video_decoder_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/decrypt_config.h" diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 9d7863c..bd7e5bb 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_ #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_ +#include <stddef.h> + #include <list> #include "base/bind.h" diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc index ccefc22..95f22e8 100644 --- a/media/filters/fake_video_decoder_unittest.cc +++ b/media/filters/fake_video_decoder_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/decoder_buffer.h" #include "media/base/mock_filters.h" diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc index 520bce1..5794ec0 100644 --- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/ffmpeg_aac_bitstream_converter.h" #include "media/filters/ffmpeg_demuxer.h" diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc index a81f2b3..61f63d1 100644 --- a/media/filters/ffmpeg_audio_decoder.cc +++ b/media/filters/ffmpeg_audio_decoder.cc @@ -4,6 +4,8 @@ #include "media/filters/ffmpeg_audio_decoder.h" +#include <stdint.h> + #include "base/callback_helpers.h" #include "base/single_thread_task_runner.h" #include "media/base/audio_buffer.h" diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index c5959c4..4bf80a2 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -9,6 +9,7 @@ #include "base/base64.h" #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index d6beb32..5308980 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -22,6 +22,9 @@ #ifndef MEDIA_FILTERS_FFMPEG_DEMUXER_H_ #define MEDIA_FILTERS_FFMPEG_DEMUXER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <utility> #include <vector> diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index c851073..1869b7a 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <deque> #include <string> @@ -9,6 +12,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "media/base/decrypt_config.h" diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc index d3819d2..ab80cb9 100644 --- a/media/filters/ffmpeg_glue.cc +++ b/media/filters/ffmpeg_glue.cc @@ -6,6 +6,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/sparse_histogram.h" #include "base/synchronization/lock.h" #include "media/base/container_names.h" diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h index 296ab72..0093dab 100644 --- a/media/filters/ffmpeg_glue.h +++ b/media/filters/ffmpeg_glue.h @@ -25,6 +25,8 @@ #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_ #define MEDIA_FILTERS_FFMPEG_GLUE_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc index 9cdc1cd..783289f 100644 --- a/media/filters/ffmpeg_glue_unittest.cc +++ b/media/filters/ffmpeg_glue_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/mock_filters.h" #include "media/base/test_data_util.h" diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc index 897658de..017e27c 100644 --- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc +++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc @@ -4,6 +4,8 @@ #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" +#include <stdint.h> + #include "base/logging.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/formats/mp4/box_definitions.h" diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc index 91530b2..61b4fe6 100644 --- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc +++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" diff --git a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc index 0d32bb2..08b5082 100644 --- a/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc +++ b/media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc @@ -4,6 +4,8 @@ #include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h" +#include <stdint.h> + #include "base/logging.h" #include "media/base/decrypt_config.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 09a119f9..38d4405 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -4,6 +4,9 @@ #include "media/filters/ffmpeg_video_decoder.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index 191d22b..da3a1f2 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <list> #include <string> #include <vector> #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h index 800c02a..8322bf7 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_ #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ +#include <stdint.h> + #include <string> #include "base/files/file.h" diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc index 6e34935..08ff943 100644 --- a/media/filters/file_data_source_unittest.cc +++ b/media/filters/file_data_source_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/base_paths.h" #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "media/base/test_helpers.h" diff --git a/media/filters/frame_processor.cc b/media/filters/frame_processor.cc index 9a637dc..6f7706d 100644 --- a/media/filters/frame_processor.cc +++ b/media/filters/frame_processor.cc @@ -4,8 +4,11 @@ #include "media/filters/frame_processor.h" +#include <stdint.h> + #include <cstdlib> +#include "base/macros.h" #include "base/stl_util.h" #include "media/base/stream_parser_buffer.h" #include "media/base/timestamp_constants.h" diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc index 71f135c..f6fd401 100644 --- a/media/filters/frame_processor_unittest.cc +++ b/media/filters/frame_processor_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index bcd1cc6..31931c5 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -14,6 +14,7 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/task_runner_util.h" +#include "build/build_config.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h index b295e59..3223552 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include <map> #include <set> diff --git a/media/filters/h264_bit_reader.h b/media/filters/h264_bit_reader.h index f201131..a3d856a 100644 --- a/media/filters/h264_bit_reader.h +++ b/media/filters/h264_bit_reader.h @@ -7,6 +7,7 @@ #ifndef MEDIA_FILTERS_H264_BIT_READER_H_ #define MEDIA_FILTERS_H264_BIT_READER_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> diff --git a/media/filters/h264_bitstream_buffer.h b/media/filters/h264_bitstream_buffer.h index 5c8f01a..f16245d 100644 --- a/media/filters/h264_bitstream_buffer.h +++ b/media/filters/h264_bitstream_buffer.h @@ -10,6 +10,9 @@ #ifndef MEDIA_FILTERS_H264_BITSTREAM_BUFFER_H_ #define MEDIA_FILTERS_H264_BITSTREAM_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/gtest_prod_util.h" #include "base/numerics/safe_conversions.h" #include "media/base/media_export.h" diff --git a/media/filters/h264_bitstream_buffer_unittest.cc b/media/filters/h264_bitstream_buffer_unittest.cc index 64b18d9..9c17efe 100644 --- a/media/filters/h264_bitstream_buffer_unittest.cc +++ b/media/filters/h264_bitstream_buffer_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/filters/h264_bitstream_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/filters/h264_parser.cc b/media/filters/h264_parser.cc index e10b935..d751de7 100644 --- a/media/filters/h264_parser.cc +++ b/media/filters/h264_parser.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/media/filters/h264_parser.h b/media/filters/h264_parser.h index e5b1e5a..707a6d2 100644 --- a/media/filters/h264_parser.h +++ b/media/filters/h264_parser.h @@ -7,6 +7,8 @@ #ifndef MEDIA_FILTERS_H264_PARSER_H_ #define MEDIA_FILTERS_H264_PARSER_H_ +#include <stddef.h> +#include <stdint.h> #include <sys/types.h> #include <map> diff --git a/media/filters/h264_to_annex_b_bitstream_converter.cc b/media/filters/h264_to_annex_b_bitstream_converter.cc index 5194911..e4860ec 100644 --- a/media/filters/h264_to_annex_b_bitstream_converter.cc +++ b/media/filters/h264_to_annex_b_bitstream_converter.cc @@ -4,6 +4,8 @@ #include "media/filters/h264_to_annex_b_bitstream_converter.h" +#include <stddef.h> + #include "base/logging.h" #include "media/filters/h264_parser.h" #include "media/formats/mp4/box_definitions.h" diff --git a/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc b/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc index 40193da..97a7704 100644 --- a/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc +++ b/media/filters/h264_to_annex_b_bitstream_converter_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/filters/h264_to_annex_b_bitstream_converter.h" #include "media/formats/mp4/box_definitions.h" diff --git a/media/filters/h265_parser.cc b/media/filters/h265_parser.cc index d710ddb..bf935e0 100644 --- a/media/filters/h265_parser.cc +++ b/media/filters/h265_parser.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/media/filters/h265_parser.h b/media/filters/h265_parser.h index f8e7402..18c423c 100644 --- a/media/filters/h265_parser.h +++ b/media/filters/h265_parser.h @@ -7,6 +7,7 @@ #ifndef MEDIA_FILTERS_H265_PARSER_H_ #define MEDIA_FILTERS_H265_PARSER_H_ +#include <stdint.h> #include <sys/types.h> #include <map> diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h index 652f6e3..041aaf1 100644 --- a/media/filters/in_memory_url_protocol.h +++ b/media/filters/in_memory_url_protocol.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_ #define MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "media/filters/ffmpeg_glue.h" diff --git a/media/filters/in_memory_url_protocol_unittest.cc b/media/filters/in_memory_url_protocol_unittest.cc index 7f4a964..3368d5f 100644 --- a/media/filters/in_memory_url_protocol_unittest.cc +++ b/media/filters/in_memory_url_protocol_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/ffmpeg/ffmpeg_common.h" #include "media/filters/in_memory_url_protocol.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/filters/ivf_parser_unittest.cc b/media/filters/ivf_parser_unittest.cc index 2d89dc2..91a27e9 100644 --- a/media/filters/ivf_parser_unittest.cc +++ b/media/filters/ivf_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/files/memory_mapped_file.h" #include "media/base/test_data_util.h" #include "media/filters/ivf_parser.h" diff --git a/media/filters/jpeg_parser.cc b/media/filters/jpeg_parser.cc index d46a7e3..c473b3c 100644 --- a/media/filters/jpeg_parser.cc +++ b/media/filters/jpeg_parser.cc @@ -6,6 +6,7 @@ #include "base/big_endian.h" #include "base/logging.h" +#include "base/macros.h" using base::BigEndianReader; diff --git a/media/filters/jpeg_parser_unittest.cc b/media/filters/jpeg_parser_unittest.cc index 40e30b6..6fbea1a 100644 --- a/media/filters/jpeg_parser_unittest.cc +++ b/media/filters/jpeg_parser_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/at_exit.h" #include "base/files/memory_mapped_file.h" #include "base/path_service.h" diff --git a/media/filters/opus_audio_decoder.cc b/media/filters/opus_audio_decoder.cc index 429ef1f..4067ac5 100644 --- a/media/filters/opus_audio_decoder.cc +++ b/media/filters/opus_audio_decoder.cc @@ -4,6 +4,9 @@ #include "media/filters/opus_audio_decoder.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include "base/single_thread_task_runner.h" diff --git a/media/filters/opus_constants.h b/media/filters/opus_constants.h index 0def7c69..aea1a4f 100644 --- a/media/filters/opus_constants.h +++ b/media/filters/opus_constants.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_OPUS_CONSTANTS_H_ #define MEDIA_FILTERS_OPUS_CONSTANTS_H_ +#include <stdint.h> + namespace media { // The Opus specification is part of IETF RFC 6716: diff --git a/media/filters/source_buffer_platform_lowmem.cc b/media/filters/source_buffer_platform_lowmem.cc index 90ed051..9fc0c65 100644 --- a/media/filters/source_buffer_platform_lowmem.cc +++ b/media/filters/source_buffer_platform_lowmem.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "media/filters/source_buffer_platform.h" namespace media { diff --git a/media/filters/source_buffer_range.h b/media/filters/source_buffer_range.h index e7cdeb7..c29ed4f 100644 --- a/media/filters/source_buffer_range.h +++ b/media/filters/source_buffer_range.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_SOURCE_BUFFER_RANGE_H_ #define MEDIA_FILTERS_SOURCE_BUFFER_RANGE_H_ +#include <stddef.h> + #include <map> #include "base/callback.h" diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h index 00d3d42..8921595 100644 --- a/media/filters/source_buffer_stream.h +++ b/media/filters/source_buffer_stream.h @@ -10,6 +10,8 @@ #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_ #define MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_ +#include <stddef.h> + #include <deque> #include <list> #include <string> diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index 808ec09..fd80708 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc @@ -4,6 +4,7 @@ #include "media/filters/source_buffer_stream.h" +#include <stddef.h> #include <stdint.h> #include <string> #include <vector> @@ -11,6 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index fc3257b..09f5539 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -4,12 +4,16 @@ #include "media/filters/stream_parser_factory.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/pattern.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "media/base/media_switches.h" #include "media/formats/mpeg/adts_stream_parser.h" #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" diff --git a/media/filters/video_cadence_estimator.h b/media/filters/video_cadence_estimator.h index 6442932..c0bc0da 100644 --- a/media/filters/video_cadence_estimator.h +++ b/media/filters/video_cadence_estimator.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FILTERS_VIDEO_CADENCE_ESTIMATOR_H_ #define MEDIA_FILTERS_VIDEO_CADENCE_ESTIMATOR_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/filters/video_cadence_estimator_unittest.cc b/media/filters/video_cadence_estimator_unittest.cc index e128dc7..939b35c 100644 --- a/media/filters/video_cadence_estimator_unittest.cc +++ b/media/filters/video_cadence_estimator_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc index 2796845..35fd6c9 100644 --- a/media/filters/video_decoder_selector_unittest.cc +++ b/media/filters/video_decoder_selector_unittest.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "media/base/gmock_callback_support.h" #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc index c9e9f0a..8a3d3a6 100644 --- a/media/filters/video_frame_stream_unittest.cc +++ b/media/filters/video_frame_stream_unittest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "media/base/fake_demuxer_stream.h" #include "media/base/gmock_callback_support.h" diff --git a/media/filters/video_renderer_algorithm.h b/media/filters/video_renderer_algorithm.h index 2e01623..3eea86b 100644 --- a/media/filters/video_renderer_algorithm.h +++ b/media/filters/video_renderer_algorithm.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FILTERS_VIDEO_RENDERER_ALGORITHM_H_ #define MEDIA_FILTERS_VIDEO_RENDERER_ALGORITHM_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include "base/callback.h" diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc index 422bf28..e35aa01 100644 --- a/media/filters/video_renderer_algorithm_unittest.cc +++ b/media/filters/video_renderer_algorithm_unittest.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/timestamp_constants.h" diff --git a/media/filters/vp8_bool_decoder.h b/media/filters/vp8_bool_decoder.h index 1c59cd2..16a98bd 100644 --- a/media/filters/vp8_bool_decoder.h +++ b/media/filters/vp8_bool_decoder.h @@ -43,6 +43,8 @@ #ifndef MEDIA_FILTERS_VP8_BOOL_DECODER_H_ #define MEDIA_FILTERS_VP8_BOOL_DECODER_H_ +#include <stddef.h> +#include <stdint.h> #include <sys/types.h> #include "base/logging.h" diff --git a/media/filters/vp8_bool_decoder_unittest.cc b/media/filters/vp8_bool_decoder_unittest.cc index 4c74182..cb8d711 100644 --- a/media/filters/vp8_bool_decoder_unittest.cc +++ b/media/filters/vp8_bool_decoder_unittest.cc @@ -4,8 +4,12 @@ #include "media/filters/vp8_bool_decoder.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/filters/vp8_parser.h b/media/filters/vp8_parser.h index 5b83180..df56f9b 100644 --- a/media/filters/vp8_parser.h +++ b/media/filters/vp8_parser.h @@ -8,6 +8,9 @@ #ifndef MEDIA_FILTERS_VP8_PARSER_H_ #define MEDIA_FILTERS_VP8_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "media/base/media_export.h" #include "media/filters/vp8_bool_decoder.h" diff --git a/media/filters/vp8_parser_unittest.cc b/media/filters/vp8_parser_unittest.cc index 3087ed0..966a0b8 100644 --- a/media/filters/vp8_parser_unittest.cc +++ b/media/filters/vp8_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/files/memory_mapped_file.h" #include "base/logging.h" #include "media/base/test_data_util.h" diff --git a/media/filters/vp9_parser.cc b/media/filters/vp9_parser.cc index 322aef2..d9319bf 100644 --- a/media/filters/vp9_parser.cc +++ b/media/filters/vp9_parser.cc @@ -9,6 +9,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" namespace { diff --git a/media/filters/vp9_parser_unittest.cc b/media/filters/vp9_parser_unittest.cc index 15496ae..c7c6482 100644 --- a/media/filters/vp9_parser_unittest.cc +++ b/media/filters/vp9_parser_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/memory_mapped_file.h" #include "base/logging.h" #include "media/base/test_data_util.h" diff --git a/media/filters/vp9_raw_bits_reader_unittest.cc b/media/filters/vp9_raw_bits_reader_unittest.cc index 999dbe1..77d5ac1 100644 --- a/media/filters/vp9_raw_bits_reader_unittest.cc +++ b/media/filters/vp9_raw_bits_reader_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/filters/vp9_raw_bits_reader.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc index 4a3f66c..40814bb 100644 --- a/media/filters/vpx_video_decoder.cc +++ b/media/filters/vpx_video_decoder.cc @@ -4,6 +4,9 @@ #include "media/filters/vpx_video_decoder.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> #include <vector> @@ -13,6 +16,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" diff --git a/media/filters/webvtt_util.h b/media/filters/webvtt_util.h index d5ffa73..cdddbee 100644 --- a/media/filters/webvtt_util.h +++ b/media/filters/webvtt_util.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FILTERS_WEBVTT_UTIL_H_ #define MEDIA_FILTERS_WEBVTT_UTIL_H_ +#include <stdint.h> + #include <vector> namespace media { diff --git a/media/formats/common/offset_byte_queue.h b/media/formats/common/offset_byte_queue.h index 6ec6405..eb0bd2c 100644 --- a/media/formats/common/offset_byte_queue.h +++ b/media/formats/common/offset_byte_queue.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ #define MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/byte_queue.h" #include "media/base/media_export.h" diff --git a/media/formats/common/offset_byte_queue_unittest.cc b/media/formats/common/offset_byte_queue_unittest.cc index 574def0..3a3acd3 100644 --- a/media/formats/common/offset_byte_queue_unittest.cc +++ b/media/formats/common/offset_byte_queue_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> #include <string.h> #include "base/memory/scoped_ptr.h" diff --git a/media/formats/common/stream_parser_test_base.h b/media/formats/common/stream_parser_test_base.h index f3431cd..42cb8d1 100644 --- a/media/formats/common/stream_parser_test_base.h +++ b/media/formats/common/stream_parser_test_base.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ #define MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_decoder_config.h" diff --git a/media/formats/mp2t/es_adapter_video.cc b/media/formats/mp2t/es_adapter_video.cc index 972f8c7..bc04827 100644 --- a/media/formats/mp2t/es_adapter_video.cc +++ b/media/formats/mp2t/es_adapter_video.cc @@ -4,6 +4,8 @@ #include "media/formats/mp2t/es_adapter_video.h" +#include <stddef.h> + #include "media/base/timestamp_constants.h" #include "media/base/video_decoder_config.h" #include "media/formats/mp2t/mp2t_common.h" diff --git a/media/formats/mp2t/es_adapter_video.h b/media/formats/mp2t/es_adapter_video.h index 564f5e8..6db2526 100644 --- a/media/formats/mp2t/es_adapter_video.h +++ b/media/formats/mp2t/es_adapter_video.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_ #define MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_ +#include <stdint.h> + #include <deque> #include <list> #include <utility> diff --git a/media/formats/mp2t/es_adapter_video_unittest.cc b/media/formats/mp2t/es_adapter_video_unittest.cc index eced6f3..a6e1684 100644 --- a/media/formats/mp2t/es_adapter_video_unittest.cc +++ b/media/formats/mp2t/es_adapter_video_unittest.cc @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <sstream> #include <string> #include <vector> #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "media/base/media_util.h" diff --git a/media/formats/mp2t/es_parser.h b/media/formats/mp2t/es_parser.h index 6e4dd7e..ee9d6e8 100644 --- a/media/formats/mp2t/es_parser.h +++ b/media/formats/mp2t/es_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H_ #define MEDIA_FORMATS_MP2T_ES_PARSER_H_ +#include <stdint.h> + #include <list> #include <utility> diff --git a/media/formats/mp2t/es_parser_adts.cc b/media/formats/mp2t/es_parser_adts.cc index a32d9f1..5a90973 100644 --- a/media/formats/mp2t/es_parser_adts.cc +++ b/media/formats/mp2t/es_parser_adts.cc @@ -4,6 +4,8 @@ #include "media/formats/mp2t/es_parser_adts.h" +#include <stddef.h> + #include <vector> #include "base/logging.h" diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h index 02b7356a..ab45de8 100644 --- a/media/formats/mp2t/es_parser_adts.h +++ b/media/formats/mp2t/es_parser_adts.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ +#include <stdint.h> + #include <list> #include <utility> diff --git a/media/formats/mp2t/es_parser_adts_unittest.cc b/media/formats/mp2t/es_parser_adts_unittest.cc index e7ccb5c..59fa850 100644 --- a/media/formats/mp2t/es_parser_adts_unittest.cc +++ b/media/formats/mp2t/es_parser_adts_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/stream_parser_buffer.h" #include "media/formats/mp2t/es_parser_adts.h" diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h index b220c36..9ce8ea0 100644 --- a/media/formats/mp2t/es_parser_h264.h +++ b/media/formats/mp2t/es_parser_h264.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_ #define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_ +#include <stdint.h> + #include <list> #include <utility> diff --git a/media/formats/mp2t/es_parser_h264_unittest.cc b/media/formats/mp2t/es_parser_h264_unittest.cc index c134f44..c7255e0 100644 --- a/media/formats/mp2t/es_parser_h264_unittest.cc +++ b/media/formats/mp2t/es_parser_h264_unittest.cc @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <sstream> #include <string> #include <vector> #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "media/base/stream_parser_buffer.h" diff --git a/media/formats/mp2t/es_parser_mpeg1audio.h b/media/formats/mp2t/es_parser_mpeg1audio.h index c110887..304b5c3 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.h +++ b/media/formats/mp2t/es_parser_mpeg1audio.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ #define MEDIA_FORMATS_MP2T_ES_PARSER_MPEG1AUDIO_H_ +#include <stdint.h> + #include <list> #include <utility> diff --git a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc index cb78950..c29f4df 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc +++ b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_log.h" #include "media/base/stream_parser_buffer.h" diff --git a/media/formats/mp2t/es_parser_test_base.h b/media/formats/mp2t/es_parser_test_base.h index 56930d4..82c02d1 100644 --- a/media/formats/mp2t/es_parser_test_base.h +++ b/media/formats/mp2t/es_parser_test_base.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_TEST_BASE_H_ #define MEDIA_FORMATS_MP2T_ES_PARSER_TEST_BASE_H_ +#include <stddef.h> +#include <stdint.h> + #include <sstream> #include <string> #include <vector> diff --git a/media/formats/mp2t/mp2t_stream_parser.h b/media/formats/mp2t/mp2t_stream_parser.h index 90e1d3e..47c283d 100644 --- a/media/formats/mp2t/mp2t_stream_parser.h +++ b/media/formats/mp2t/mp2t_stream_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ +#include <stdint.h> + #include <list> #include <map> diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc index 9bc2b3f..ab1d230 100644 --- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc +++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> diff --git a/media/formats/mp2t/timestamp_unroller_unittest.cc b/media/formats/mp2t/timestamp_unroller_unittest.cc index d99f5bd8..952ab1c 100644 --- a/media/formats/mp2t/timestamp_unroller_unittest.cc +++ b/media/formats/mp2t/timestamp_unroller_unittest.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> #include <stdint.h> #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/test/perf_test_suite.h" #include "media/formats/mp2t/timestamp_unroller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/formats/mp2t/ts_section.h b/media/formats/mp2t/ts_section.h index 7451b9e..0821bf1 100644 --- a/media/formats/mp2t/ts_section.h +++ b/media/formats/mp2t/ts_section.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_H_ +#include <stdint.h> + namespace media { namespace mp2t { diff --git a/media/formats/mp2t/ts_section_pes.h b/media/formats/mp2t/ts_section_pes.h index fd4d143..a8b5c16 100644 --- a/media/formats/mp2t/ts_section_pes.h +++ b/media/formats/mp2t/ts_section_pes.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/formats/mp2t/ts_section_psi.h b/media/formats/mp2t/ts_section_psi.h index 0af4e4d..27fbdf8 100644 --- a/media/formats/mp2t/ts_section_psi.h +++ b/media/formats/mp2t/ts_section_psi.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "media/base/byte_queue.h" diff --git a/media/formats/mp4/aac.cc b/media/formats/mp4/aac.cc index ea4765b..e391b4d 100644 --- a/media/formats/mp4/aac.cc +++ b/media/formats/mp4/aac.cc @@ -4,9 +4,12 @@ #include "media/formats/mp4/aac.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" +#include "build/build_config.h" #include "media/base/bit_reader.h" #include "media/formats/mp4/rcheck.h" #include "media/formats/mpeg/adts_constants.h" diff --git a/media/formats/mp4/aac.h b/media/formats/mp4/aac.h index 4328b56..4f607ff 100644 --- a/media/formats/mp4/aac.h +++ b/media/formats/mp4/aac.h @@ -5,8 +5,11 @@ #ifndef MEDIA_FORMATS_MP4_AAC_H_ #define MEDIA_FORMATS_MP4_AAC_H_ +#include <stdint.h> + #include <vector> +#include "build/build_config.h" #include "media/base/channel_layout.h" #include "media/base/media_export.h" #include "media/base/media_log.h" diff --git a/media/formats/mp4/aac_unittest.cc b/media/formats/mp4/aac_unittest.cc index 5b6e6b4..5f428c6 100644 --- a/media/formats/mp4/aac_unittest.cc +++ b/media/formats/mp4/aac_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "media/base/mock_media_log.h" diff --git a/media/formats/mp4/avc.h b/media/formats/mp4/avc.h index 19858b9..e1df1dd 100644 --- a/media/formats/mp4/avc.h +++ b/media/formats/mp4/avc.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_MP4_AVC_H_ #define MEDIA_FORMATS_MP4_AVC_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/memory/scoped_ptr.h" diff --git a/media/formats/mp4/avc_unittest.cc b/media/formats/mp4/avc_unittest.cc index 2faf56e..dd635c5 100644 --- a/media/formats/mp4/avc_unittest.cc +++ b/media/formats/mp4/avc_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> #include <string.h> +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "media/base/decrypt_config.h" diff --git a/media/formats/mp4/bitstream_converter.h b/media/formats/mp4/bitstream_converter.h index efd6356..3084c3d 100644 --- a/media/formats/mp4/bitstream_converter.h +++ b/media/formats/mp4/bitstream_converter.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP4_BITSTREAM_CONVERTER_H_ #define MEDIA_FORMATS_MP4_BITSTREAM_CONVERTER_H_ +#include <stdint.h> + #include <vector> #include "base/memory/ref_counted.h" diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h index eed6581..e6a62bb 100644 --- a/media/formats/mp4/box_definitions.h +++ b/media/formats/mp4/box_definitions.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/formats/mp4/box_reader.cc b/media/formats/mp4/box_reader.cc index 4f32031..91e406d 100644 --- a/media/formats/mp4/box_reader.cc +++ b/media/formats/mp4/box_reader.cc @@ -4,6 +4,7 @@ #include "media/formats/mp4/box_reader.h" +#include <stddef.h> #include <string.h> #include <algorithm> #include <set> diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc index fdcec61..6504702 100644 --- a/media/formats/mp4/box_reader_unittest.cc +++ b/media/formats/mp4/box_reader_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> #include <string.h> #include "base/logging.h" diff --git a/media/formats/mp4/cenc.h b/media/formats/mp4/cenc.h index 44670f3..6e3b380 100644 --- a/media/formats/mp4/cenc.h +++ b/media/formats/mp4/cenc.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_MP4_CENC_H_ #define MEDIA_FORMATS_MP4_CENC_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "media/base/decrypt_config.h" diff --git a/media/formats/mp4/es_descriptor.cc b/media/formats/mp4/es_descriptor.cc index 3377c8c..9fde9c2 100644 --- a/media/formats/mp4/es_descriptor.cc +++ b/media/formats/mp4/es_descriptor.cc @@ -4,6 +4,8 @@ #include "media/formats/mp4/es_descriptor.h" +#include <stddef.h> + #include "media/base/bit_reader.h" #include "media/formats/mp4/rcheck.h" diff --git a/media/formats/mp4/es_descriptor_unittest.cc b/media/formats/mp4/es_descriptor_unittest.cc index 4a0262b..8f1c67e 100644 --- a/media/formats/mp4/es_descriptor_unittest.cc +++ b/media/formats/mp4/es_descriptor_unittest.cc @@ -4,6 +4,8 @@ #include "media/formats/mp4/es_descriptor.h" +#include <stdint.h> + #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/formats/mp4/hevc.h b/media/formats/mp4/hevc.h index bb53e01..99b898d 100644 --- a/media/formats/mp4/hevc.h +++ b/media/formats/mp4/hevc.h @@ -5,6 +5,9 @@ #ifndef MEDIA_FORMATS_MP4_HEVC_H_ #define MEDIA_FORMATS_MP4_HEVC_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/memory/scoped_ptr.h" diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc index af64343..6faf303 100644 --- a/media/formats/mp4/mp4_stream_parser.cc +++ b/media/formats/mp4/mp4_stream_parser.cc @@ -4,12 +4,15 @@ #include "media/formats/mp4/mp4_stream_parser.h" +#include <stddef.h> + #include <limits> #include <vector> #include "base/callback_helpers.h" #include "base/logging.h" #include "base/time/time.h" +#include "build/build_config.h" #include "media/base/audio_decoder_config.h" #include "media/base/stream_parser_buffer.h" #include "media/base/text_track_config.h" diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc index 9d3d169..79f68c1 100644 --- a/media/formats/mp4/mp4_stream_parser_unittest.cc +++ b/media/formats/mp4/mp4_stream_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> diff --git a/media/formats/mp4/sample_to_group_iterator.h b/media/formats/mp4/sample_to_group_iterator.h index 50823af..4c06200 100644 --- a/media/formats/mp4/sample_to_group_iterator.h +++ b/media/formats/mp4/sample_to_group_iterator.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MP4_SAMPLE_TO_GROUP_ITERATOR_H_ #define MEDIA_FORMATS_MP4_SAMPLE_TO_GROUP_ITERATOR_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/formats/mp4/sample_to_group_iterator_unittest.cc b/media/formats/mp4/sample_to_group_iterator_unittest.cc index d4486f7..e94b5ff 100644 --- a/media/formats/mp4/sample_to_group_iterator_unittest.cc +++ b/media/formats/mp4/sample_to_group_iterator_unittest.cc @@ -4,6 +4,10 @@ #include "media/formats/mp4/sample_to_group_iterator.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/formats/mp4/track_run_iterator.cc b/media/formats/mp4/track_run_iterator.cc index 8a6866b..c47b8a3 100644 --- a/media/formats/mp4/track_run_iterator.cc +++ b/media/formats/mp4/track_run_iterator.cc @@ -8,6 +8,7 @@ #include <iomanip> #include <limits> +#include "base/macros.h" #include "media/formats/mp4/rcheck.h" #include "media/formats/mp4/sample_to_group_iterator.h" diff --git a/media/formats/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h index 4ecbbb9..bab090e 100644 --- a/media/formats/mp4/track_run_iterator.h +++ b/media/formats/mp4/track_run_iterator.h @@ -5,6 +5,7 @@ #ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_ #define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_ +#include <stddef.h> #include <stdint.h> #include <vector> diff --git a/media/formats/mp4/track_run_iterator_unittest.cc b/media/formats/mp4/track_run_iterator_unittest.cc index 9221cc4..3ac4a41 100644 --- a/media/formats/mp4/track_run_iterator_unittest.cc +++ b/media/formats/mp4/track_run_iterator_unittest.cc @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "media/base/mock_media_log.h" diff --git a/media/formats/mpeg/adts_stream_parser.cc b/media/formats/mpeg/adts_stream_parser.cc index 90b3689c..38c01cc 100644 --- a/media/formats/mpeg/adts_stream_parser.cc +++ b/media/formats/mpeg/adts_stream_parser.cc @@ -4,6 +4,8 @@ #include "media/formats/mpeg/adts_stream_parser.h" +#include <stddef.h> + #include "media/formats/mpeg/adts_constants.h" namespace media { diff --git a/media/formats/mpeg/adts_stream_parser.h b/media/formats/mpeg/adts_stream_parser.h index 17e18eb..d22a3b9 100644 --- a/media/formats/mpeg/adts_stream_parser.h +++ b/media/formats/mpeg/adts_stream_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MPEG_ADTS_STREAM_PARSER_H_ #define MEDIA_FORMATS_MPEG_ADTS_STREAM_PARSER_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/media_export.h" #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h" diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.h b/media/formats/mpeg/mpeg1_audio_stream_parser.h index c970498..9dd7afd 100644 --- a/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_ #define MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/media_export.h" #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h" diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc b/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc index b247acb..50a0c13 100644 --- a/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc +++ b/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/base/test_data_util.h" #include "media/formats/common/stream_parser_test_base.h" #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h index 6dacee3..0b72be9 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ +#include <stdint.h> + #include <set> #include <vector> diff --git a/media/formats/webm/cluster_builder.h b/media/formats/webm/cluster_builder.h index d123c85..c05789e 100644 --- a/media/formats/webm/cluster_builder.h +++ b/media/formats/webm/cluster_builder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_ #define MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/media/formats/webm/opus_packet_builder.h b/media/formats/webm/opus_packet_builder.h index b7bec7f..e48b3c5 100644 --- a/media/formats/webm/opus_packet_builder.h +++ b/media/formats/webm/opus_packet_builder.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_OPUS_PACKET_BUILDER_H_ #define MEDIA_FORMATS_WEBM_OPUS_PACKET_BUILDER_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/formats/webm/webm_audio_client.h b/media/formats/webm/webm_audio_client.h index aed8ce2..fefa55f 100644 --- a/media/formats/webm/webm_audio_client.h +++ b/media/formats/webm/webm_audio_client.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_ #define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/formats/webm/webm_cluster_parser.cc b/media/formats/webm/webm_cluster_parser.cc index 21420b74..27094de 100644 --- a/media/formats/webm/webm_cluster_parser.cc +++ b/media/formats/webm/webm_cluster_parser.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/sys_byteorder.h" #include "media/base/decrypt_config.h" #include "media/base/timestamp_constants.h" diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h index 9d674ca..3976cfa 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ +#include <stdint.h> + #include <deque> #include <map> #include <set> diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc index 1605dfe..504226c86 100644 --- a/media/formats/webm/webm_cluster_parser_unittest.cc +++ b/media/formats/webm/webm_cluster_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cstdlib> #include <string> @@ -9,6 +12,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "media/base/audio_decoder_config.h" #include "media/base/decrypt_config.h" diff --git a/media/formats/webm/webm_content_encodings.h b/media/formats/webm/webm_content_encodings.h index 6057bba..0a7e8e6 100644 --- a/media/formats/webm/webm_content_encodings.h +++ b/media/formats/webm/webm_content_encodings.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h index 0e768e8..41cb7c0 100644 --- a/media/formats/webm/webm_content_encodings_client.h +++ b/media/formats/webm/webm_content_encodings_client.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ +#include <stdint.h> + #include <vector> #include "base/callback.h" diff --git a/media/formats/webm/webm_content_encodings_client_unittest.cc b/media/formats/webm/webm_content_encodings_client_unittest.cc index 657e2c4..268eee0 100644 --- a/media/formats/webm/webm_content_encodings_client_unittest.cc +++ b/media/formats/webm/webm_content_encodings_client_unittest.cc @@ -4,6 +4,8 @@ #include "media/formats/webm/webm_content_encodings_client.h" +#include <stdint.h> + #include <string> #include "base/bind.h" diff --git a/media/formats/webm/webm_crypto_helpers.h b/media/formats/webm/webm_crypto_helpers.h index d386302..284b2d0 100644 --- a/media/formats/webm/webm_crypto_helpers.h +++ b/media/formats/webm/webm_crypto_helpers.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_ #define MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_ +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "media/base/decoder_buffer.h" diff --git a/media/formats/webm/webm_info_parser.h b/media/formats/webm/webm_info_parser.h index 147bf30..7548ad2 100644 --- a/media/formats/webm/webm_info_parser.h +++ b/media/formats/webm/webm_info_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_ #define MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/time/time.h" diff --git a/media/formats/webm/webm_parser.cc b/media/formats/webm/webm_parser.cc index 6929a83..985bada 100644 --- a/media/formats/webm/webm_parser.cc +++ b/media/formats/webm/webm_parser.cc @@ -11,10 +11,13 @@ // encrypted request for comments specification is here // http://wiki.webmproject.org/encryption/webm-encryption-rfc +#include <stddef.h> + #include <iomanip> #include <limits> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "media/formats/webm/webm_constants.h" diff --git a/media/formats/webm/webm_parser_unittest.cc b/media/formats/webm/webm_parser_unittest.cc index 26f5f4b..fad4526 100644 --- a/media/formats/webm/webm_parser_unittest.cc +++ b/media/formats/webm/webm_parser_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "media/formats/webm/cluster_builder.h" #include "media/formats/webm/webm_constants.h" #include "media/formats/webm/webm_parser.h" diff --git a/media/formats/webm/webm_stream_parser.h b/media/formats/webm/webm_stream_parser.h index 59ddab0..aeddb1f 100644 --- a/media/formats/webm/webm_stream_parser.h +++ b/media/formats/webm/webm_stream_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ +#include <stdint.h> + #include "base/callback_forward.h" #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h index 774ad7d..3569907 100644 --- a/media/formats/webm/webm_tracks_parser.h +++ b/media/formats/webm/webm_tracks_parser.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ #define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> diff --git a/media/formats/webm/webm_tracks_parser_unittest.cc b/media/formats/webm/webm_tracks_parser_unittest.cc index 7e5a067..6bcfc38 100644 --- a/media/formats/webm/webm_tracks_parser_unittest.cc +++ b/media/formats/webm/webm_tracks_parser_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "media/base/channel_layout.h" #include "media/base/mock_media_log.h" diff --git a/media/formats/webm/webm_video_client.h b/media/formats/webm/webm_video_client.h index 3ef7357..dfdc5f6 100644 --- a/media/formats/webm/webm_video_client.h +++ b/media/formats/webm/webm_video_client.h @@ -5,6 +5,8 @@ #ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ #define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/media/formats/webm/webm_webvtt_parser_unittest.cc b/media/formats/webm/webm_webvtt_parser_unittest.cc index c40d1a1..5ce3e18 100644 --- a/media/formats/webm/webm_webvtt_parser_unittest.cc +++ b/media/formats/webm/webm_webvtt_parser_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "media/formats/webm/webm_webvtt_parser.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/midi/midi_input_port_android.h b/media/midi/midi_input_port_android.h index 1e1a800..684fcc6 100644 --- a/media/midi/midi_input_port_android.h +++ b/media/midi/midi_input_port_android.h @@ -6,6 +6,8 @@ #define MEDIA_MIDI_MIDI_INPUT_PORT_ANDROID_H_ #include <jni.h> +#include <stddef.h> +#include <stdint.h> #include "base/android/scoped_java_ref.h" #include "base/time/time.h" diff --git a/media/midi/midi_jni_registrar.cc b/media/midi/midi_jni_registrar.cc index 9a89b7b..e49a024 100644 --- a/media/midi/midi_jni_registrar.cc +++ b/media/midi/midi_jni_registrar.cc @@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "media/midi/midi_device_android.h" #include "media/midi/midi_input_port_android.h" diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc index 3c97a0f..21f6c23 100644 --- a/media/midi/midi_manager.cc +++ b/media/midi/midi_manager.cc @@ -8,6 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" namespace media { namespace midi { diff --git a/media/midi/midi_manager.h b/media/midi/midi_manager.h index 1426057..dd8466f 100644 --- a/media/midi/midi_manager.h +++ b/media/midi/midi_manager.h @@ -5,6 +5,9 @@ #ifndef MEDIA_MIDI_MIDI_MANAGER_H_ #define MEDIA_MIDI_MIDI_MANAGER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <vector> diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index f4b87ba..e51a502 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -6,6 +6,7 @@ #include <errno.h> #include <poll.h> +#include <stddef.h> #include <stdlib.h> #include <algorithm> #include <string> @@ -14,6 +15,7 @@ #include "base/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/safe_strerror.h" diff --git a/media/midi/midi_manager_alsa.h b/media/midi/midi_manager_alsa.h index d8c22c9..eccd543 100644 --- a/media/midi/midi_manager_alsa.h +++ b/media/midi/midi_manager_alsa.h @@ -6,6 +6,7 @@ #define MEDIA_MIDI_MIDI_MANAGER_ALSA_H_ #include <alsa/asoundlib.h> +#include <stdint.h> #include <map> #include <vector> diff --git a/media/midi/midi_manager_android.h b/media/midi/midi_manager_android.h index eb1daf8..97f156d 100644 --- a/media/midi/midi_manager_android.h +++ b/media/midi/midi_manager_android.h @@ -6,6 +6,8 @@ #define MEDIA_MIDI_MIDI_MANAGER_ANDROID_H_ #include <jni.h> +#include <stddef.h> +#include <stdint.h> #include <vector> #include "base/android/scoped_java_ref.h" diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc index 721851b..79b14f8 100644 --- a/media/midi/midi_manager_mac.cc +++ b/media/midi/midi_manager_mac.cc @@ -12,6 +12,7 @@ #include "base/strings/sys_string_conversions.h" #include <CoreAudio/HostTime.h> +#include <stddef.h> using base::IntToString; using base::SysCFStringRefToUTF8; diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h index c7bdb30..9b36f8c 100644 --- a/media/midi/midi_manager_mac.h +++ b/media/midi/midi_manager_mac.h @@ -6,6 +6,7 @@ #define MEDIA_MIDI_MIDI_MANAGER_MAC_H_ #include <CoreMIDI/MIDIServices.h> +#include <stdint.h> #include <map> #include <string> #include <vector> diff --git a/media/midi/midi_manager_mac_unittest.cc b/media/midi/midi_manager_mac_unittest.cc index 9bd01c3..1955d09 100644 --- a/media/midi/midi_manager_mac_unittest.cc +++ b/media/midi/midi_manager_mac_unittest.cc @@ -5,8 +5,11 @@ #include "media/midi/midi_manager_mac.h" #include <CoreMIDI/MIDIServices.h> +#include <stddef.h> +#include <stdint.h> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc index 0c77dda..6ae5def 100644 --- a/media/midi/midi_manager_unittest.cc +++ b/media/midi/midi_manager_unittest.cc @@ -4,15 +4,20 @@ #include "media/midi/midi_manager.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/system_monitor/system_monitor.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/midi/midi_manager_usb.h b/media/midi/midi_manager_usb.h index 2ec97b8..12e8ed5 100644 --- a/media/midi/midi_manager_usb.h +++ b/media/midi/midi_manager_usb.h @@ -5,6 +5,9 @@ #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_ #define MEDIA_MIDI_MIDI_MANAGER_USB_H_ +#include <stddef.h> +#include <stdint.h> + #include <utility> #include <vector> diff --git a/media/midi/midi_manager_usb_unittest.cc b/media/midi/midi_manager_usb_unittest.cc index 57b723a..662ec19 100644 --- a/media/midi/midi_manager_usb_unittest.cc +++ b/media/midi/midi_manager_usb_unittest.cc @@ -4,8 +4,12 @@ #include "media/midi/midi_manager_usb.h" +#include <stddef.h> +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc index dfbd3f9..7c26a2d 100644 --- a/media/midi/midi_manager_win.cc +++ b/media/midi/midi_manager_win.cc @@ -19,6 +19,7 @@ #define MMNOMCI #define MMNOMMIO #include <mmsystem.h> +#include <stddef.h> #include <algorithm> #include <functional> diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h index b52f96c..350d5ad 100644 --- a/media/midi/midi_manager_win.h +++ b/media/midi/midi_manager_win.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MIDI_MIDI_MANAGER_WIN_H_ #define MEDIA_MIDI_MIDI_MANAGER_WIN_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/midi/midi_message_queue.h b/media/midi/midi_message_queue.h index 8573781..999d877 100644 --- a/media/midi/midi_message_queue.h +++ b/media/midi/midi_message_queue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_MIDI_MIDI_MESSAGE_QUEUE_H_ #define MEDIA_MIDI_MIDI_MESSAGE_QUEUE_H_ +#include <stddef.h> #include <stdint.h> #include <deque> diff --git a/media/midi/midi_message_queue_unittest.cc b/media/midi/midi_message_queue_unittest.cc index ce2c9fe..97c6e1c 100644 --- a/media/midi/midi_message_queue_unittest.cc +++ b/media/midi/midi_message_queue_unittest.cc @@ -4,6 +4,9 @@ #include "media/midi/midi_message_queue.h" +#include <stddef.h> +#include <stdint.h> + #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/midi/midi_message_util_unittest.cc b/media/midi/midi_message_util_unittest.cc index 666687f..260a5a7 100644 --- a/media/midi/midi_message_util_unittest.cc +++ b/media/midi/midi_message_util_unittest.cc @@ -4,6 +4,8 @@ #include "media/midi/midi_message_util.h" +#include <stdint.h> + #include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/midi/midi_output_port_android.h b/media/midi/midi_output_port_android.h index c5bba22..5b510e1 100644 --- a/media/midi/midi_output_port_android.h +++ b/media/midi/midi_output_port_android.h @@ -6,6 +6,7 @@ #define MEDIA_MIDI_MIDI_OUTPUT_PORT_ANDROID_H_ #include <jni.h> +#include <stdint.h> #include <vector> #include "base/android/scoped_java_ref.h" diff --git a/media/midi/midi_scheduler.h b/media/midi/midi_scheduler.h index 5f9386a..17354a9 100644 --- a/media/midi/midi_scheduler.h +++ b/media/midi/midi_scheduler.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MIDI_MIDI_SCHEDULER_H_ #define MEDIA_MIDI_MIDI_SCHEDULER_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/media/midi/midi_switches.cc b/media/midi/midi_switches.cc index 1fee12c..91c2266 100644 --- a/media/midi/midi_switches.cc +++ b/media/midi/midi_switches.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "media/midi/midi_switches.h" namespace switches { diff --git a/media/midi/usb_midi_descriptor_parser.h b/media/midi/usb_midi_descriptor_parser.h index bb6f791..97df43e 100644 --- a/media/midi/usb_midi_descriptor_parser.h +++ b/media/midi/usb_midi_descriptor_parser.h @@ -6,6 +6,7 @@ #ifndef MEDIA_MIDI_USB_MIDI_DESCRIPTOR_PARSER_H_ #define MEDIA_MIDI_USB_MIDI_DESCRIPTOR_PARSER_H_ +#include <stddef.h> #include <stdint.h> #include <string> diff --git a/media/midi/usb_midi_descriptor_parser_unittest.cc b/media/midi/usb_midi_descriptor_parser_unittest.cc index e0a68cc..93b0df4 100644 --- a/media/midi/usb_midi_descriptor_parser_unittest.cc +++ b/media/midi/usb_midi_descriptor_parser_unittest.cc @@ -4,6 +4,9 @@ #include "media/midi/usb_midi_descriptor_parser.h" +#include <stdint.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { diff --git a/media/midi/usb_midi_device.h b/media/midi/usb_midi_device.h index 9f1ffbd..c94687b 100644 --- a/media/midi/usb_midi_device.h +++ b/media/midi/usb_midi_device.h @@ -5,6 +5,9 @@ #ifndef MEDIA_MIDI_USB_MIDI_DEVICE_H_ #define MEDIA_MIDI_USB_MIDI_DEVICE_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/callback.h" diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc index 464615e..bbdb6c3 100644 --- a/media/midi/usb_midi_device_android.cc +++ b/media/midi/usb_midi_device_android.cc @@ -4,6 +4,8 @@ #include "media/midi/usb_midi_device_android.h" +#include <stddef.h> + #include "base/android/jni_array.h" #include "base/i18n/icu_string_conversions.h" #include "base/strings/stringprintf.h" diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h index ce857af..58f45b3 100644 --- a/media/midi/usb_midi_device_android.h +++ b/media/midi/usb_midi_device_android.h @@ -6,6 +6,7 @@ #define MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ #include <jni.h> +#include <stdint.h> #include <string> #include <vector> diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc index 9a7a422..ed07383 100644 --- a/media/midi/usb_midi_device_factory_android.cc +++ b/media/midi/usb_midi_device_factory_android.cc @@ -4,6 +4,8 @@ #include "media/midi/usb_midi_device_factory_android.h" +#include <stddef.h> + #include "base/android/context_utils.h" #include "base/bind.h" #include "base/containers/hash_tables.h" diff --git a/media/midi/usb_midi_input_stream.h b/media/midi/usb_midi_input_stream.h index 0d6fd49..f933ef7 100644 --- a/media/midi/usb_midi_input_stream.h +++ b/media/midi/usb_midi_input_stream.h @@ -5,6 +5,9 @@ #ifndef MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ #define MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> diff --git a/media/midi/usb_midi_input_stream_unittest.cc b/media/midi/usb_midi_input_stream_unittest.cc index b38a477..7bf50e6 100644 --- a/media/midi/usb_midi_input_stream_unittest.cc +++ b/media/midi/usb_midi_input_stream_unittest.cc @@ -4,9 +4,13 @@ #include "media/midi/usb_midi_input_stream.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" diff --git a/media/midi/usb_midi_output_stream.cc b/media/midi/usb_midi_output_stream.cc index 11cce3c..9f4fee8 100644 --- a/media/midi/usb_midi_output_stream.cc +++ b/media/midi/usb_midi_output_stream.cc @@ -5,6 +5,7 @@ #include "media/midi/usb_midi_output_stream.h" #include "base/logging.h" +#include "base/macros.h" #include "media/midi/midi_message_util.h" #include "media/midi/usb_midi_device.h" diff --git a/media/midi/usb_midi_output_stream.h b/media/midi/usb_midi_output_stream.h index c176e46..1d6b4da 100644 --- a/media/midi/usb_midi_output_stream.h +++ b/media/midi/usb_midi_output_stream.h @@ -5,6 +5,7 @@ #ifndef MEDIA_MIDI_USB_MIDI_OUTPUT_STREAM_H_ #define MEDIA_MIDI_USB_MIDI_OUTPUT_STREAM_H_ +#include <stddef.h> #include <stdint.h> #include <vector> diff --git a/media/midi/usb_midi_output_stream_unittest.cc b/media/midi/usb_midi_output_stream_unittest.cc index 19c8d94..cc47661 100644 --- a/media/midi/usb_midi_output_stream_unittest.cc +++ b/media/midi/usb_midi_output_stream_unittest.cc @@ -4,9 +4,13 @@ #include "media/midi/usb_midi_output_stream.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "media/midi/usb_midi_device.h" diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc index 54e90f2..b2bf99d 100644 --- a/media/mojo/services/android_mojo_media_client.cc +++ b/media/mojo/services/android_mojo_media_client.cc @@ -4,6 +4,7 @@ #include "media/mojo/services/mojo_media_client.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/android/android_cdm_factory.h" #include "media/base/bind_to_current_loop.h" diff --git a/media/mojo/services/default_mojo_media_client.cc b/media/mojo/services/default_mojo_media_client.cc index 846643f..59c3393 100644 --- a/media/mojo/services/default_mojo_media_client.cc +++ b/media/mojo/services/default_mojo_media_client.cc @@ -4,6 +4,7 @@ #include "media/mojo/services/mojo_media_client.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_output_stream_sink.h" diff --git a/media/mojo/services/demuxer_stream_provider_shim.h b/media/mojo/services/demuxer_stream_provider_shim.h index 0628f99..8dc7e78 100644 --- a/media/mojo/services/demuxer_stream_provider_shim.h +++ b/media/mojo/services/demuxer_stream_provider_shim.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc index 6d5d0c1..6064d34 100644 --- a/media/mojo/services/media_apptest.cc +++ b/media/mojo/services/media_apptest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/callback.h" #include "base/macros.h" diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc index 4e73e40..db6d1e8 100644 --- a/media/mojo/services/media_type_converters.cc +++ b/media/mojo/services/media_type_converters.cc @@ -4,6 +4,9 @@ #include "media/mojo/services/media_type_converters.h" +#include <stddef.h> +#include <stdint.h> + #include "media/base/audio_buffer.h" #include "media/base/audio_decoder_config.h" #include "media/base/buffering_state.h" diff --git a/media/mojo/services/media_type_converters_unittest.cc b/media/mojo/services/media_type_converters_unittest.cc index db23e92..619b810 100644 --- a/media/mojo/services/media_type_converters_unittest.cc +++ b/media/mojo/services/media_type_converters_unittest.cc @@ -4,8 +4,11 @@ #include "media/mojo/services/media_type_converters.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> +#include "base/macros.h" #include "media/base/audio_buffer.h" #include "media/base/audio_decoder_config.h" #include "media/base/cdm_config.h" @@ -27,8 +30,8 @@ void CompareBytes(uint8_t* original_data, uint8_t* result_data, size_t length) { // Compare the actual video frame bytes (|rows| rows of |row|bytes| data), // skipping any padding that may be in either frame. -void CompareRowBytes(uint8* original_data, - uint8* result_data, +void CompareRowBytes(uint8_t* original_data, + uint8_t* result_data, size_t rows, size_t row_bytes, size_t original_stride, diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc index be5a9ce..0ce8815 100644 --- a/media/mojo/services/mojo_cdm.cc +++ b/media/mojo/services/mojo_cdm.cc @@ -4,6 +4,8 @@ #include "media/mojo/services/mojo_cdm.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h index 2774e56..6ff7d109 100644 --- a/media/mojo/services/mojo_cdm.h +++ b/media/mojo/services/mojo_cdm.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_H_ #define MEDIA_MOJO_SERVICES_MOJO_CDM_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h index 5f0d80d..f56a589 100644 --- a/media/mojo/services/mojo_cdm_promise.h +++ b/media/mojo/services/mojo_cdm_promise.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ +#include <stdint.h> + #include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc index a7d5fc5..95a07d0 100644 --- a/media/mojo/services/mojo_cdm_service.cc +++ b/media/mojo/services/mojo_cdm_service.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/base/cdm_config.h" #include "media/base/cdm_context.h" diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h index d41ad2f..2eabaa8 100644 --- a/media/mojo/services/mojo_cdm_service.h +++ b/media/mojo/services/mojo_cdm_service.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_ #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" diff --git a/media/mojo/services/mojo_cdm_service_context.h b/media/mojo/services/mojo_cdm_service_context.h index 4df452f..4b797f9 100644 --- a/media/mojo/services/mojo_cdm_service_context.h +++ b/media/mojo/services/mojo_cdm_service_context.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_ #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_ +#include <stdint.h> + #include <map> #include "base/macros.h" diff --git a/media/mojo/services/mojo_decryptor.cc b/media/mojo/services/mojo_decryptor.cc index cc1b250..95d9364 100644 --- a/media/mojo/services/mojo_decryptor.cc +++ b/media/mojo/services/mojo_decryptor.cc @@ -4,6 +4,9 @@ #include "media/mojo/services/mojo_decryptor.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/bind.h" diff --git a/media/mojo/services/mojo_decryptor_service.cc b/media/mojo/services/mojo_decryptor_service.cc index 8eee96f..60d634d 100644 --- a/media/mojo/services/mojo_decryptor_service.cc +++ b/media/mojo/services/mojo_decryptor_service.cc @@ -4,6 +4,8 @@ #include "media/mojo/services/mojo_decryptor_service.h" +#include <stdint.h> + #include <utility> #include "base/bind.h" diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc index a3cd0fe..2f79704 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.cc +++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc @@ -4,6 +4,8 @@ #include "media/mojo/services/mojo_demuxer_stream_adapter.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "media/base/decoder_buffer.h" diff --git a/media/mojo/services/mojo_demuxer_stream_impl.cc b/media/mojo/services/mojo_demuxer_stream_impl.cc index c390e8d..7c162f8 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.cc +++ b/media/mojo/services/mojo_demuxer_stream_impl.cc @@ -4,6 +4,8 @@ #include "media/mojo/services/mojo_demuxer_stream_impl.h" +#include <stdint.h> + #include "base/bind.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h" diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h index d724f3c..827f211 100644 --- a/media/mojo/services/mojo_renderer_impl.h +++ b/media/mojo/services/mojo_renderer_impl.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "media/base/renderer.h" diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index 21a1fc4..78dea69 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h @@ -5,6 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/ozone/media_ozone_platform.cc b/media/ozone/media_ozone_platform.cc index 15d52c6..f17d827 100644 --- a/media/ozone/media_ozone_platform.cc +++ b/media/ozone/media_ozone_platform.cc @@ -5,6 +5,7 @@ #include "media/ozone/media_ozone_platform.h" #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "ui/ozone/platform_object.h" #include "ui/ozone/platform_selection.h" diff --git a/media/renderers/audio_renderer_impl.cc b/media/renderers/audio_renderer_impl.cc index 424b2d3..4611055 100644 --- a/media/renderers/audio_renderer_impl.cc +++ b/media/renderers/audio_renderer_impl.cc @@ -5,6 +5,7 @@ #include "media/renderers/audio_renderer_impl.h" #include <math.h> +#include <stddef.h> #include <algorithm> diff --git a/media/renderers/audio_renderer_impl.h b/media/renderers/audio_renderer_impl.h index 3db9b6b..32abaea 100644 --- a/media/renderers/audio_renderer_impl.h +++ b/media/renderers/audio_renderer_impl.h @@ -19,6 +19,8 @@ #ifndef MEDIA_RENDERERS_AUDIO_RENDERER_IMPL_H_ #define MEDIA_RENDERERS_AUDIO_RENDERER_IMPL_H_ +#include <stdint.h> + #include <deque> #include "base/macros.h" diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc index d434548..df8733b 100644 --- a/media/renderers/audio_renderer_impl_unittest.cc +++ b/media/renderers/audio_renderer_impl_unittest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/renderers/gpu_video_accelerator_factories.h b/media/renderers/gpu_video_accelerator_factories.h index c1d464e..b108645 100644 --- a/media/renderers/gpu_video_accelerator_factories.h +++ b/media/renderers/gpu_video_accelerator_factories.h @@ -5,6 +5,9 @@ #ifndef MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #define MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/renderers/mock_gpu_video_accelerator_factories.h b/media/renderers/mock_gpu_video_accelerator_factories.h index edf3303..ce85a8d 100644 --- a/media/renderers/mock_gpu_video_accelerator_factories.h +++ b/media/renderers/mock_gpu_video_accelerator_factories.h @@ -5,6 +5,9 @@ #ifndef MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc index 7b74081..7c5a69b 100644 --- a/media/renderers/renderer_impl_unittest.cc +++ b/media/renderers/renderer_impl_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" diff --git a/media/renderers/skcanvas_video_renderer.cc b/media/renderers/skcanvas_video_renderer.cc index 68f2b28..d5b9fa9 100644 --- a/media/renderers/skcanvas_video_renderer.cc +++ b/media/renderers/skcanvas_video_renderer.cc @@ -6,6 +6,7 @@ #include <limits> +#include "base/macros.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "gpu/command_buffer/common/mailbox_holder.h" diff --git a/media/renderers/skcanvas_video_renderer.h b/media/renderers/skcanvas_video_renderer.h index 433b03a..c0f6785 100644 --- a/media/renderers/skcanvas_video_renderer.h +++ b/media/renderers/skcanvas_video_renderer.h @@ -5,6 +5,9 @@ #ifndef MEDIA_RENDERERS_SKCANVAS_VIDEO_RENDERER_H_ #define MEDIA_RENDERERS_SKCANVAS_VIDEO_RENDERER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" diff --git a/media/renderers/skcanvas_video_renderer_unittest.cc b/media/renderers/skcanvas_video_renderer_unittest.cc index ffd2221..b77650d 100644 --- a/media/renderers/skcanvas_video_renderer_unittest.cc +++ b/media/renderers/skcanvas_video_renderer_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_interface_stub.h" diff --git a/media/renderers/video_renderer_impl.h b/media/renderers/video_renderer_impl.h index f1ae0e6..b3814da 100644 --- a/media/renderers/video_renderer_impl.h +++ b/media/renderers/video_renderer_impl.h @@ -5,6 +5,9 @@ #ifndef MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_ #define MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include "base/macros.h" diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc index a40a4d7..3d14c47 100644 --- a/media/renderers/video_renderer_impl_unittest.cc +++ b/media/renderers/video_renderer_impl_unittest.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <utility> #include "base/bind.h" #include "base/callback.h" #include "base/callback_helpers.h" #include "base/debug/stack_trace.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index 2c17aff..eb0037f2 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h index 7648384..4f4bd2f 100644 --- a/media/test/pipeline_integration_test_base.h +++ b/media/test/pipeline_integration_test_base.h @@ -5,6 +5,8 @@ #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ +#include <stdint.h> + #include "base/md5.h" #include "base/message_loop/message_loop.h" #include "media/audio/clockless_audio_sink.h" diff --git a/media/video/fake_video_encode_accelerator.h b/media/video/fake_video_encode_accelerator.h index b471ded..5e7813d 100644 --- a/media/video/fake_video_encode_accelerator.h +++ b/media/video/fake_video_encode_accelerator.h @@ -5,6 +5,9 @@ #ifndef MEDIA_VIDEO_FAKE_VIDEO_ENCODE_ACCELERATOR_H_ #define MEDIA_VIDEO_FAKE_VIDEO_ENCODE_ACCELERATOR_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include <queue> #include <vector> diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc index 1e6f1fc..76b9535 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool.cc @@ -6,6 +6,8 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> #include <list> @@ -15,6 +17,7 @@ #include "base/bind.h" #include "base/containers/stack_container.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/strings/stringprintf.h" #include "base/trace_event/memory_dump_provider.h" diff --git a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc index c1fc5ba..f077885 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/test/test_simple_task_runner.h" #include "gpu/command_buffer/client/gles2_interface_stub.h" diff --git a/media/video/h264_poc.cc b/media/video/h264_poc.cc index d414b1d..164d704 100644 --- a/media/video/h264_poc.cc +++ b/media/video/h264_poc.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "media/filters/h264_parser.h" #include "media/video/h264_poc.h" diff --git a/media/video/h264_poc.h b/media/video/h264_poc.h index c444c13..a2319ca 100644 --- a/media/video/h264_poc.h +++ b/media/video/h264_poc.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_H264_POC_H_ #define MEDIA_VIDEO_H264_POC_H_ +#include <stdint.h> + #include "base/macros.h" namespace media { diff --git a/media/video/h264_poc_unittest.cc b/media/video/h264_poc_unittest.cc index 67baf93..79177db 100644 --- a/media/video/h264_poc_unittest.cc +++ b/media/video/h264_poc_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "media/base/test_data_util.h" #include "media/filters/h264_parser.h" #include "media/video/h264_poc.h" diff --git a/media/video/jpeg_decode_accelerator.h b/media/video/jpeg_decode_accelerator.h index f1e1488..3710ba8 100644 --- a/media/video/jpeg_decode_accelerator.h +++ b/media/video/jpeg_decode_accelerator.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_JPEG_DECODE_ACCELERATOR_H_ #define MEDIA_VIDEO_JPEG_DECODE_ACCELERATOR_H_ +#include <stdint.h> + #include "media/base/bitstream_buffer.h" #include "media/base/media_export.h" #include "media/base/video_frame.h" diff --git a/media/video/mock_video_decode_accelerator.h b/media/video/mock_video_decode_accelerator.h index d85032a..63aeaad 100644 --- a/media/video/mock_video_decode_accelerator.h +++ b/media/video/mock_video_decode_accelerator.h @@ -7,6 +7,8 @@ #include "video_decode_accelerator.h" +#include <stdint.h> + #include <vector> #include "base/macros.h" diff --git a/media/video/picture.h b/media/video/picture.h index e997dbb..5ec3c55 100644 --- a/media/video/picture.h +++ b/media/video/picture.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_PICTURE_H_ #define MEDIA_VIDEO_PICTURE_H_ +#include <stdint.h> + #include "gpu/command_buffer/common/mailbox.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index d7e79c8..99adb20 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -5,6 +5,8 @@ #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ +#include <stdint.h> + #include <memory> #include <vector> diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h index ee0ee33..146a111 100644 --- a/media/video/video_encode_accelerator.h +++ b/media/video/video_encode_accelerator.h @@ -5,6 +5,9 @@ #ifndef MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ #define MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_ +#include <stddef.h> +#include <stdint.h> + #include <memory> #include <vector> |