From 2e10b8e4a05c041a3c39ddc7499bdffdb67999fa Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 16 Jul 2013 12:54:53 +0000 Subject: [PATCH] Include files from webrtc/.. paths in bitrate_controller/. BUG=1662 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1787004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4349 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/bitrate_controller/bitrate_controller_impl.cc | 5 ++--- webrtc/modules/bitrate_controller/bitrate_controller_impl.h | 6 +++--- .../bitrate_controller/bitrate_controller_unittest.cc | 6 +++--- .../modules/bitrate_controller/include/bitrate_controller.h | 2 +- .../bitrate_controller/send_side_bandwidth_estimation.cc | 4 ++-- .../bitrate_controller/send_side_bandwidth_estimation.h | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc index e7a712751..ac211704f 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc @@ -9,11 +9,11 @@ * */ -#include "modules/bitrate_controller/bitrate_controller_impl.h" +#include "webrtc/modules/bitrate_controller/bitrate_controller_impl.h" #include -#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" namespace webrtc { @@ -228,4 +228,3 @@ bool BitrateControllerImpl::AvailableBandwidth(uint32_t* bandwidth) const { return bandwidth_estimation_.AvailableBandwidth(bandwidth); } } // namespace webrtc - diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h index 58122b6db..e3e263955 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h @@ -15,13 +15,13 @@ #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ #define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ -#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include #include -#include "system_wrappers/interface/critical_section_wrapper.h" -#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc index 1aafb0f71..fcf419e8c 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include "testing/gtest/include/gtest/gtest.h" #include #include -#include "modules/bitrate_controller/include/bitrate_controller.h" -#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" using webrtc::RtcpBandwidthObserver; using webrtc::BitrateObserver; diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h index 82b7e4b84..d74be1695 100644 --- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h +++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ #define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ -#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index 1fc08c578..ce385db54 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" #include // sqrt() -#include "system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h index 9df9ccd23..0c1fa9451 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h @@ -13,8 +13,8 @@ #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ #define WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ -#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { class SendSideBandwidthEstimation {