generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include files from webrtc/.. paths in bitrate_controller/.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2013-07-16 12:54:53 +00:00
parent a4407329d4
commit 2e10b8e4a0
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
View File

@ -9,11 +9,11 @@
*
*/
#include "modules/bitrate_controller/bitrate_controller_impl.h"
#include "webrtc/modules/bitrate_controller/bitrate_controller_impl.h"
#include <utility>
#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

6
webrtc/modules/bitrate_controller/bitrate_controller_impl.h
View File

@ -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 <list>
#include <map>
#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 {

6
webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <gtest/gtest.h>
#include "testing/gtest/include/gtest/gtest.h"
#include <algorithm>
#include <vector>
#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;

2
webrtc/modules/bitrate_controller/include/bitrate_controller.h
View File

@ -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 {

4
webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc
View File

@ -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 <math.h> // sqrt()
#include "system_wrappers/interface/trace.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {

4
webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h
View File

@ -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 {