From 415d2cd7454d93b3727fce9147090a24e4c3ccba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Mon, 26 Oct 2015 11:35:17 +0100 Subject: [PATCH] Use webrtc/base/logging.h for video. BUG=webrtc:5118 R=mflodman@webrtc.org Review URL: https://codereview.webrtc.org/1415413004 . Cr-Commit-Position: refs/heads/master@{#10403} --- webrtc/video/send_statistics_proxy.cc | 2 +- webrtc/video/video_capture_input.cc | 2 +- webrtc/video/video_decoder.cc | 2 +- webrtc/video/video_encoder.cc | 2 +- webrtc/video/video_receive_stream.cc | 2 +- webrtc/video/video_send_stream.cc | 2 +- webrtc/video/video_send_stream_tests.cc | 2 +- webrtc/video_engine/overuse_frame_detector.cc | 2 +- webrtc/video_engine/stream_synchronization.cc | 2 +- webrtc/video_engine/vie_channel.cc | 2 +- webrtc/video_engine/vie_encoder.cc | 2 +- webrtc/video_engine/vie_receiver.cc | 2 +- webrtc/video_engine/vie_sync_module.cc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc index daaa558568..85dcf0f936 100644 --- a/webrtc/video/send_statistics_proxy.cc +++ b/webrtc/video/send_statistics_proxy.cc @@ -15,8 +15,8 @@ #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" namespace webrtc { diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc index f98447f63c..7e63fd817f 100644 --- a/webrtc/video/video_capture_input.cc +++ b/webrtc/video/video_capture_input.cc @@ -11,6 +11,7 @@ #include "webrtc/video/video_capture_input.h" #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/utility/interface/process_thread.h" @@ -20,7 +21,6 @@ #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video_engine/overuse_frame_detector.h" diff --git a/webrtc/video/video_decoder.cc b/webrtc/video/video_decoder.cc index 4438cb0d40..fa1f2ee878 100644 --- a/webrtc/video/video_decoder.cc +++ b/webrtc/video/video_decoder.cc @@ -11,10 +11,10 @@ #include "webrtc/video_decoder.h" #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { diff --git a/webrtc/video/video_encoder.cc b/webrtc/video/video_encoder.cc index d116a1ea67..6410e395fc 100644 --- a/webrtc/video/video_encoder.cc +++ b/webrtc/video/video_encoder.cc @@ -11,10 +11,10 @@ #include "webrtc/video_encoder.h" #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { VideoEncoder* VideoEncoder::Create(VideoEncoder::EncoderType codec_type) { diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index 22c9acb7fe..09a383cac6 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -15,10 +15,10 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/call/congestion_controller.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_receive_stream.h" diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 5ba7c6fb87..4ec923f788 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -16,11 +16,11 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/call/congestion_controller.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/pacing/include/packet_router.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/video/video_capture_input.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/encoder_state_feedback.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index e30c903a51..40aaf32ea8 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -15,6 +15,7 @@ #include "webrtc/base/bind.h" #include "webrtc/base/checks.h" #include "webrtc/base/criticalsection.h" +#include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/call.h" #include "webrtc/call/transport_adapter.h" @@ -27,7 +28,6 @@ #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" diff --git a/webrtc/video_engine/overuse_frame_detector.cc b/webrtc/video_engine/overuse_frame_detector.cc index fd0b15b9ef..b0c82d9ec1 100644 --- a/webrtc/video_engine/overuse_frame_detector.cc +++ b/webrtc/video_engine/overuse_frame_detector.cc @@ -19,8 +19,8 @@ #include "webrtc/base/checks.h" #include "webrtc/base/exp_filter.h" +#include "webrtc/base/logging.h" #include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { diff --git a/webrtc/video_engine/stream_synchronization.cc b/webrtc/video_engine/stream_synchronization.cc index 8e51429701..b78cfe8874 100644 --- a/webrtc/video_engine/stream_synchronization.cc +++ b/webrtc/video_engine/stream_synchronization.cc @@ -16,7 +16,7 @@ #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/base/logging.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 9a737113b9..e375319b81 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -14,6 +14,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/common.h" #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -27,7 +28,6 @@ #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/video/receive_statistics_proxy.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 761df33b55..21da5f926a 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -15,6 +15,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/common_video/interface/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -28,7 +29,6 @@ #include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/video/send_statistics_proxy.h" diff --git a/webrtc/video_engine/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc index b1197899f4..d757f93726 100644 --- a/webrtc/video_engine/vie_receiver.cc +++ b/webrtc/video_engine/vie_receiver.cc @@ -12,6 +12,7 @@ #include +#include "webrtc/base/logging.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/interface/fec_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/receive_statistics.h" @@ -23,7 +24,6 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc index 7c87b67382..a7266c918c 100644 --- a/webrtc/video_engine/vie_sync_module.cc +++ b/webrtc/video_engine/vie_sync_module.cc @@ -10,12 +10,12 @@ #include "webrtc/video_engine/vie_sync_module.h" +#include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/video_engine/stream_synchronization.h" #include "webrtc/voice_engine/include/voe_video_sync.h"