diff options
Diffstat (limited to 'media/base')
77 files changed, 77 insertions, 0 deletions
diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h index 5d13b1c..1537c04 100644 --- a/media/base/android/audio_decoder_job.h +++ b/media/base/android/audio_decoder_job.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "media/base/android/media_decoder_job.h" namespace media { diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h index 4faab61..6b9a143 100644 --- a/media/base/android/media_codec_audio_decoder.h +++ b/media/base/android/media_codec_audio_decoder.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_ +#include "base/macros.h" #include "media/base/android/media_codec_decoder.h" namespace media { diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index 02a29f9..0b103ae 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -12,6 +12,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/android/media_codec_util.h" #include "media/base/media_export.h" diff --git a/media/base/android/media_codec_player.h b/media/base/android/media_codec_player.h index fff4129..0898b1f 100644 --- a/media/base/android/media_codec_player.h +++ b/media/base/android/media_codec_player.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_ #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h index 072a61c..b0fc798 100644 --- a/media/base/android/media_codec_video_decoder.h +++ b/media/base/android/media_codec_video_decoder.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ #include <set> +#include "base/macros.h" #include "media/base/android/media_codec_decoder.h" #include "ui/gfx/geometry/size.h" #include "ui/gl/android/scoped_java_surface.h" diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h index d82f89a..7d45718 100644 --- a/media/base/android/media_decoder_job.h +++ b/media/base/android/media_decoder_job.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/base/android/demuxer_stream_player_params.h" diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h index 87c1af2..1227ba2 100644 --- a/media/base/android/media_drm_bridge.h +++ b/media/base/android/media_drm_bridge.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/android/provision_fetcher.h" diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h index 24fb599..3ef1e7b 100644 --- a/media/base/android/media_player_android.h +++ b/media/base/android/media_player_android.h @@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/base/android/media_player_listener.h" diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index b5031e8..67681185 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/media/base/android/media_player_listener.h b/media/base/android/media_player_listener.h index e0ffb29..6d15c63 100644 --- a/media/base/android/media_player_listener.h +++ b/media/base/android/media_player_listener.h @@ -8,6 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index 0cfcfd0..20017f1 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -13,6 +13,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h index 29d5761..03b6764 100644 --- a/media/base/android/video_decoder_job.h +++ b/media/base/android/video_decoder_job.h @@ -7,6 +7,7 @@ #include <jni.h> +#include "base/macros.h" #include "media/base/android/media_decoder_job.h" namespace media { diff --git a/media/base/android/webaudio_media_codec_bridge.h b/media/base/android/webaudio_media_codec_bridge.h index 9fbcf06..2d61001 100644 --- a/media/base/android/webaudio_media_codec_bridge.h +++ b/media/base/android/webaudio_media_codec_bridge.h @@ -10,6 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" #include "base/file_descriptor_posix.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "media/base/media_export.h" diff --git a/media/base/audio_block_fifo.h b/media/base/audio_block_fifo.h index 94786b9..a90a3df 100644 --- a/media/base/audio_block_fifo.h +++ b/media/base/audio_block_fifo.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_BLOCK_FIFO_H_ #define MEDIA_BASE_AUDIO_BLOCK_FIFO_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h" diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h index fb73c34..8508689 100644 --- a/media/base/audio_buffer.h +++ b/media/base/audio_buffer.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/audio_buffer_queue.h b/media/base/audio_buffer_queue.h index 28cd5bc..9871965 100644 --- a/media/base/audio_buffer_queue.h +++ b/media/base/audio_buffer_queue.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/audio_buffer.h" #include "media/base/media_export.h" diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index 25e34e3..3a245b7 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/audio_converter.h b/media/base/audio_converter.h index 0b546dc..647cfd2 100644 --- a/media/base/audio_converter.h +++ b/media/base/audio_converter.h @@ -21,6 +21,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "media/audio/audio_parameters.h" diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h index 337d2a7..681fac3 100644 --- a/media/base/audio_decoder.h +++ b/media/base/audio_decoder.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/cdm_context.h" diff --git a/media/base/audio_discard_helper.h b/media/base/audio_discard_helper.h index 7708a2f..94cf2e5 100644 --- a/media/base/audio_discard_helper.h +++ b/media/base/audio_discard_helper.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ #define MEDIA_BASE_AUDIO_DISCARD_HELPER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/audio_timestamp_helper.h" diff --git a/media/base/audio_fifo.h b/media/base/audio_fifo.h index c00dd40..213a61e 100644 --- a/media/base/audio_fifo.h +++ b/media/base/audio_fifo.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_FIFO_H_ #define MEDIA_BASE_AUDIO_FIFO_H_ +#include "base/macros.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h" diff --git a/media/base/audio_hardware_config.h b/media/base/audio_hardware_config.h index 46f3192..f7d2678 100644 --- a/media/base/audio_hardware_config.h +++ b/media/base/audio_hardware_config.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_HARDWARE_CONFIG_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" diff --git a/media/base/audio_hash.h b/media/base/audio_hash.h index 4f47d97..71a6507 100644 --- a/media/base/audio_hash.h +++ b/media/base/audio_hash.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_piece.h" #include "media/base/media_export.h" diff --git a/media/base/audio_pull_fifo.h b/media/base/audio_pull_fifo.h index 338f9b4..a839c8d 100644 --- a/media/base/audio_pull_fifo.h +++ b/media/base/audio_pull_fifo.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_PULL_FIFO_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h index aa59bf3..79438c7 100644 --- a/media/base/audio_renderer.h +++ b/media/base/audio_renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_AUDIO_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/buffering_state.h" #include "media/base/cdm_context.h" diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h index 80e9d9b..c84779d 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/time/time.h" diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h index 9ec4518..50f54bd 100644 --- a/media/base/audio_renderer_mixer_input.h +++ b/media/base/audio_renderer_mixer_input.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" #include "url/origin.h" diff --git a/media/base/audio_splicer.h b/media/base/audio_splicer.h index db25e53..bd07776 100644 --- a/media/base/audio_splicer.h +++ b/media/base/audio_splicer.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_SPLICER_H_ #define MEDIA_BASE_AUDIO_SPLICER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/audio_timestamp_helper.h b/media/base/audio_timestamp_helper.h index 6862209..1ec4120 100644 --- a/media/base/audio_timestamp_helper.h +++ b/media/base/audio_timestamp_helper.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ #define MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/bit_reader.h b/media/base/bit_reader.h index 0dcd895..b91145c 100644 --- a/media/base/bit_reader.h +++ b/media/base/bit_reader.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_BIT_READER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/bit_reader_core.h" #include "media/base/media_export.h" diff --git a/media/base/bit_reader_core.h b/media/base/bit_reader_core.h index 587d71d..a40e405 100644 --- a/media/base/bit_reader_core.h +++ b/media/base/bit_reader_core.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_BIT_READER_CORE_H_ #include "base/logging.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/byte_queue.h b/media/base/byte_queue.h index 1533adb..e9aedd9 100644 --- a/media/base/byte_queue.h +++ b/media/base/byte_queue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_BYTE_QUEUE_H_ #define MEDIA_BASE_BYTE_QUEUE_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 e4b5849..875fb78 100644 --- a/media/base/cdm_callback_promise.h +++ b/media/base/cdm_callback_promise.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "media/base/cdm_promise.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h index a120707..d7f4961 100644 --- a/media/base/cdm_factory.h +++ b/media/base/cdm_factory.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h index fa15cb9..2c74483 100644 --- a/media/base/cdm_promise.h +++ b/media/base/cdm_promise.h @@ -8,6 +8,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/media_keys.h" diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h index bb81921..6ae50f1 100644 --- a/media/base/data_buffer.h +++ b/media/base/data_buffer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_DATA_BUFFER_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/data_source.h b/media/base/data_source.h index 8a63d6b..cfd185f 100644 --- a/media/base/data_source.h +++ b/media/base/data_source.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_DATA_SOURCE_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h index 3e57f29..ea4b044 100644 --- a/media/base/decoder_buffer.h +++ b/media/base/decoder_buffer.h @@ -9,6 +9,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/decoder_buffer_queue.h b/media/base/decoder_buffer_queue.h index 9c2c2dc..8a097f6 100644 --- a/media/base/decoder_buffer_queue.h +++ b/media/base/decoder_buffer_queue.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h index c9e2373..cc6ccae 100644 --- a/media/base/decrypt_config.h +++ b/media/base/decrypt_config.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/decryptor.h b/media/base/decryptor.h index 04435f2..9c7f64d 100644 --- a/media/base/decryptor.h +++ b/media/base/decryptor.h @@ -8,6 +8,7 @@ #include <list> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_buffer.h" #include "media/base/media_export.h" diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 5e3fc4a..7be31ab 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/data_source.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/demuxer_stream_provider.h b/media/base/demuxer_stream_provider.h index 1d27092..e5289f3 100644 --- a/media/base/demuxer_stream_provider.h +++ b/media/base/demuxer_stream_provider.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_DEMUXER_STREAM_PROVIDER_H_ #define MEDIA_BASE_DEMUXER_STREAM_PROVIDER_H_ +#include "base/macros.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h index 49d64ba..87c3382 100644 --- a/media/base/fake_audio_render_callback.h +++ b/media/base/fake_audio_render_callback.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ #define MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_ +#include "base/macros.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/fake_audio_renderer_sink.h b/media/base/fake_audio_renderer_sink.h index 765257d..8ac055a 100644 --- a/media/base/fake_audio_renderer_sink.h +++ b/media/base/fake_audio_renderer_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_renderer_sink.h" diff --git a/media/base/fake_demuxer_stream.h b/media/base/fake_demuxer_stream.h index ef2af06..c927636 100644 --- a/media/base/fake_demuxer_stream.h +++ b/media/base/fake_demuxer_stream.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_FAKE_DEMUXER_STREAM_H_ #define MEDIA_BASE_FAKE_DEMUXER_STREAM_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/audio_decoder_config.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/fake_output_device.h b/media/base/fake_output_device.h index 121a375..45a6abb 100644 --- a/media/base/fake_output_device.h +++ b/media/base/fake_output_device.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/base/output_device.h" namespace media { diff --git a/media/base/fake_text_track_stream.h b/media/base/fake_text_track_stream.h index bbfbe8b..6088286 100644 --- a/media/base/fake_text_track_stream.h +++ b/media/base/fake_text_track_stream.h @@ -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/audio_decoder_config.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h index accb659..47c31a9 100644 --- a/media/base/keyboard_event_counter.h +++ b/media/base/keyboard_event_counter.h @@ -7,6 +7,7 @@ #include <set> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "media/base/media_export.h" #include "ui/events/event_constants.h" diff --git a/media/base/mac/corevideo_glue.h b/media/base/mac/corevideo_glue.h index ca40047..302953d 100644 --- a/media/base/mac/corevideo_glue.h +++ b/media/base/mac/corevideo_glue.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_MAC_COREVIDEO_GLUE_H_ #define MEDIA_BASE_MAC_COREVIDEO_GLUE_H_ +#include "base/macros.h" #include "media/base/media_export.h" // Although CoreVideo exists in 10.6, not all of its types and functions were diff --git a/media/base/media_file_checker.h b/media/base/media_file_checker.h index 03be321..86db498 100644 --- a/media/base/media_file_checker.h +++ b/media/base/media_file_checker.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_MEDIA_FILE_CHECKER_H_ #include "base/files/file.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace base { diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 37b3019..63ca4eb 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/media/base/media_log.h b/media/base/media_log.h index 24fabb2..680ae3d 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -9,6 +9,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" diff --git a/media/base/mock_audio_renderer_sink.h b/media/base/mock_audio_renderer_sink.h index a966f71..2194bc9 100644 --- a/media/base/mock_audio_renderer_sink.h +++ b/media/base/mock_audio_renderer_sink.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/mock_demuxer_host.h b/media/base/mock_demuxer_host.h index f9e8e43..614f971 100644 --- a/media/base/mock_demuxer_host.h +++ b/media/base/mock_demuxer_host.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_MOCK_DEMUXER_HOST_H_ #define MEDIA_BASE_MOCK_DEMUXER_HOST_H_ +#include "base/macros.h" #include "media/base/demuxer.h" #include "media/base/text_track_config.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/mock_media_log.h b/media/base/mock_media_log.h index 421c2d2..f58dc1d 100644 --- a/media/base/mock_media_log.h +++ b/media/base/mock_media_log.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "media/base/media_log.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/base/moving_average.h b/media/base/moving_average.h index 948fe31..bb28653 100644 --- a/media/base/moving_average.h +++ b/media/base/moving_average.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/multi_channel_resampler.h b/media/base/multi_channel_resampler.h index 690f750..84c50b9 100644 --- a/media/base/multi_channel_resampler.h +++ b/media/base/multi_channel_resampler.h @@ -8,6 +8,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "media/base/sinc_resampler.h" diff --git a/media/base/null_video_sink.h b/media/base/null_video_sink.h index b5a384b..cafcbf0 100644 --- a/media/base/null_video_sink.h +++ b/media/base/null_video_sink.h @@ -6,6 +6,7 @@ #define MEDIA_AUDIO_NULL_VIDEO_SINK_H_ #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 3ec8feb..ba99348 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_PIPELINE_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" diff --git a/media/base/player_tracker.h b/media/base/player_tracker.h index aba01b3..57c59ab 100644 --- a/media/base/player_tracker.h +++ b/media/base/player_tracker.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_PLAYER_TRACKER_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/media_export.h" namespace media { diff --git a/media/base/renderer.h b/media/base/renderer.h index d5b323b..89e349a 100644 --- a/media/base/renderer.h +++ b/media/base/renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/buffering_state.h" diff --git a/media/base/seekable_buffer.h b/media/base/seekable_buffer.h index 42c3abc..91b68db 100644 --- a/media/base/seekable_buffer.h +++ b/media/base/seekable_buffer.h @@ -35,6 +35,7 @@ #include <list> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h index fb1b660..4847e4c 100644 --- a/media/base/serial_runner.h +++ b/media/base/serial_runner.h @@ -9,6 +9,7 @@ #include <queue> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h index e12f381..f320633 100644 --- a/media/base/sinc_resampler.h +++ b/media/base/sinc_resampler.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h index 0554d29..1db22dd 100644 --- a/media/base/stream_parser.h +++ b/media/base/stream_parser.h @@ -11,6 +11,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h index 06b0c0d..26f5742 100644 --- a/media/base/stream_parser_buffer.h +++ b/media/base/stream_parser_buffer.h @@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index ff89c59a..293e517 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_TEST_HELPERS_H_ #include "base/callback.h" +#include "base/macros.h" #include "media/base/channel_layout.h" #include "media/base/media_log.h" #include "media/base/pipeline_status.h" diff --git a/media/base/text_cue.h b/media/base/text_cue.h index 2afae8d..08f5c24 100644 --- a/media/base/text_cue.h +++ b/media/base/text_cue.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h index 5890952..2888daf 100644 --- a/media/base/text_renderer.h +++ b/media/base/text_renderer.h @@ -9,6 +9,7 @@ #include <set> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream.h" diff --git a/media/base/time_delta_interpolator.h b/media/base/time_delta_interpolator.h index f05a74c..75f355f 100644 --- a/media/base/time_delta_interpolator.h +++ b/media/base/time_delta_interpolator.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ #define MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ +#include "base/macros.h" #include "base/time/time.h" #include "media/base/media_export.h" diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h index 8016a00..574d695 100644 --- a/media/base/user_input_monitor.h +++ b/media/base/user_input_monitor.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_USER_INPUT_MONITOR_H_ #define MEDIA_BASE_USER_INPUT_MONITOR_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list_threadsafe.h" diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h index 074718b..68737c7 100644 --- a/media/base/video_decoder.h +++ b/media/base/video_decoder.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/base/cdm_context.h" #include "media/base/media_export.h" diff --git a/media/base/video_frame_metadata.h b/media/base/video_frame_metadata.h index 5e4c900..b35225b 100644 --- a/media/base/video_frame_metadata.h +++ b/media/base/video_frame_metadata.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/values.h" #include "media/base/media_export.h" diff --git a/media/base/video_frame_pool.h b/media/base/video_frame_pool.h index d5c1690..167c0e9 100644 --- a/media/base/video_frame_pool.h +++ b/media/base/video_frame_pool.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_VIDEO_FRAME_POOL_H_ #define MEDIA_BASE_VIDEO_FRAME_POOL_H_ +#include "base/macros.h" #include "media/base/media_export.h" #include "media/base/video_frame.h" diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h index d85ec60..6acce77 100644 --- a/media/base/video_renderer.h +++ b/media/base/video_renderer.h @@ -6,6 +6,7 @@ #define MEDIA_BASE_VIDEO_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/base/buffering_state.h" diff --git a/media/base/wall_clock_time_source.h b/media/base/wall_clock_time_source.h index 4046e8e..a19b1c8 100644 --- a/media/base/wall_clock_time_source.h +++ b/media/base/wall_clock_time_source.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_ #define MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/time/default_tick_clock.h" |