Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1418)

Side by Side Diff: webrtc/logging/rtc_event_log/rtc_event_log.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" 11 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
12 12
13 #include <limits> 13 #include <limits>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/atomicops.h"
17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/base/event.h"
20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/protobuf_utils.h"
22 #include "webrtc/base/swap_queue.h"
23 #include "webrtc/base/thread_checker.h"
24 #include "webrtc/base/timeutils.h"
25 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h" 16 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h"
26 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_networ k_adaptor.h" 17 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_networ k_adaptor.h"
27 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" 18 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
28 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
29 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 20 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" 21 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
31 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" 22 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
32 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" 23 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
33 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
34 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
35 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" 26 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
36 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
37 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
38 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
39 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" 30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
31 #include "webrtc/rtc_base/atomicops.h"
32 #include "webrtc/rtc_base/checks.h"
33 #include "webrtc/rtc_base/constructormagic.h"
34 #include "webrtc/rtc_base/event.h"
35 #include "webrtc/rtc_base/logging.h"
36 #include "webrtc/rtc_base/protobuf_utils.h"
37 #include "webrtc/rtc_base/swap_queue.h"
38 #include "webrtc/rtc_base/thread_checker.h"
39 #include "webrtc/rtc_base/timeutils.h"
40 #include "webrtc/system_wrappers/include/file_wrapper.h" 40 #include "webrtc/system_wrappers/include/file_wrapper.h"
41 41
42 #ifdef ENABLE_RTC_EVENT_LOG 42 #ifdef ENABLE_RTC_EVENT_LOG
43 // *.pb.h files are generated at build-time by the protobuf compiler. 43 // *.pb.h files are generated at build-time by the protobuf compiler.
44 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 44 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
45 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 45 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
46 #else 46 #else
47 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 47 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
48 #endif 48 #endif
49 #endif 49 #endif
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 #else 606 #else
607 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 607 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
608 #endif // ENABLE_RTC_EVENT_LOG 608 #endif // ENABLE_RTC_EVENT_LOG
609 } 609 }
610 610
611 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() { 611 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() {
612 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 612 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
613 } 613 }
614 614
615 } // namespace webrtc 615 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log.h ('k') | webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698