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

Include files from webrtc/.. paths in remote_bitrate_estimator/

Browse Source 
BUG=1662
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1552004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4108 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-05-27 12:41:33 +00:00
parent aa30bb7ef5
commit 47ce120efb
13 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/remote_bitrate_estimator/bitrate_estimator.h
View File

@ -13,7 +13,7 @@
#include <list> #include <list>
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

3
webrtc/modules/remote_bitrate_estimator/bitrate_estimator_unittest.cc
View File

@ -8,8 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "webrtc/modules/remote_bitrate_estimator/bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/bitrate_estimator.h"
namespace { namespace {

2
webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_
#include "typedefs.h" #include "webrtc/typedefs.h"
#define BWE_MAX(a,b) ((a)>(b)?(a):(b)) #define BWE_MAX(a,b) ((a)>(b)?(a):(b))
#define BWE_MIN(a,b) ((a)<(b)?(a):(b)) #define BWE_MIN(a,b) ((a)<(b)?(a):(b))

5
webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
View File

@ -11,11 +11,10 @@
#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_ESTIMATOR_H_ #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_ESTIMATOR_H_
#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_ESTIMATOR_H_ #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_ESTIMATOR_H_
#include <gmock/gmock.h>
#include <vector> #include <vector>
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "testing/gmock/include/gmock/gmock.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
namespace webrtc { namespace webrtc {

2
webrtc/modules/remote_bitrate_estimator/include/rtp_to_ntp.h
View File

@ -13,7 +13,7 @@
#include <list> #include <list>
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

8
webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
View File

@ -14,10 +14,10 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
#include "modules/remote_bitrate_estimator/remote_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/remote_rate_control.h"
#include "modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#ifdef WEBRTC_BWE_MATLAB #ifdef WEBRTC_BWE_MATLAB
extern MatlabEngine eng; // global variable defined elsewhere extern MatlabEngine eng; // global variable defined elsewhere

8
webrtc/modules/remote_bitrate_estimator/overuse_detector.h
View File

@ -12,12 +12,12 @@
#include <list> #include <list>
#include "modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "typedefs.h" // NOLINT(build/include) #include "webrtc/typedefs.h"
#ifdef WEBRTC_BWE_MATLAB #ifdef WEBRTC_BWE_MATLAB
#include "../test/BWEStandAlone/MatlabPlot.h" #include "webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.h"
#endif #endif
namespace webrtc { namespace webrtc {

4
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_multi_stream_unittest.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc { namespace webrtc {

4
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc { namespace webrtc {

3
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
View File

@ -11,12 +11,11 @@
#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_
#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_
#include <gtest/gtest.h>
#include <list> #include <list>
#include <map> #include <map>
#include <utility> #include <utility>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"

4
webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc
View File

@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "modules/remote_bitrate_estimator/remote_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/remote_rate_control.h"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc { namespace webrtc {

2
webrtc/modules/remote_bitrate_estimator/remote_rate_control.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_REMOTE_RATE_CONTROL_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_REMOTE_RATE_CONTROL_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_REMOTE_RATE_CONTROL_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_REMOTE_RATE_CONTROL_H_
#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
namespace webrtc { namespace webrtc {

4
webrtc/modules/remote_bitrate_estimator/rtp_to_ntp_unittest.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "modules/remote_bitrate_estimator/include/rtp_to_ntp.h" #include "webrtc/modules/remote_bitrate_estimator/include/rtp_to_ntp.h"
namespace webrtc { namespace webrtc {