Reland "Move smoothing filter to common audio".
The original CL was this https://codereview.webrtc.org/2484153002/
Due to failure with internal trial servers, it was reverted. This CL tries to reland it.
BUG=webrtc:6443
Review-Url: https://codereview.webrtc.org/2520003005
Cr-Commit-Position: refs/heads/master@{#15227}
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index b3532b1..1fe2d7e 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -363,6 +363,7 @@
testonly = true
sources = [
"api/fakemetricsobserver.cc",
+ "base/analytics/exp_filter_unittest.cc",
"base/array_view_unittest.cc",
"base/atomicops_unittest.cc",
"base/autodetectproxy_unittest.cc",
@@ -380,7 +381,6 @@
"base/criticalsection_unittest.cc",
"base/event_tracer_unittest.cc",
"base/event_unittest.cc",
- "base/exp_filter_unittest.cc",
"base/file_unittest.cc",
"base/filerotatingstream_unittest.cc",
"base/fileutils_unittest.cc",
@@ -511,6 +511,7 @@
"base:rtc_base",
"base:rtc_base_tests_utils",
"base:rtc_task_queue",
+ "base/analytics:rtc_analytics",
"p2p:libstunprober",
"p2p:rtc_p2p",
"//testing/gmock",
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index d1e6002..3708dc2 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -124,8 +124,6 @@
"event.h",
"event_tracer.cc",
"event_tracer.h",
- "exp_filter.cc",
- "exp_filter.h",
"file.cc",
"file.h",
"format_macros.h",
diff --git a/webrtc/base/analytics/BUILD.gn b/webrtc/base/analytics/BUILD.gn
new file mode 100644
index 0000000..e7e631d
--- /dev/null
+++ b/webrtc/base/analytics/BUILD.gn
@@ -0,0 +1,16 @@
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../build/webrtc.gni")
+
+rtc_static_library("rtc_analytics") {
+ sources = [
+ "exp_filter.cc",
+ "exp_filter.h",
+ ]
+}
diff --git a/webrtc/base/exp_filter.cc b/webrtc/base/analytics/exp_filter.cc
similarity index 95%
rename from webrtc/base/exp_filter.cc
rename to webrtc/base/analytics/exp_filter.cc
index 9529480..48fe1ad 100644
--- a/webrtc/base/exp_filter.cc
+++ b/webrtc/base/analytics/exp_filter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/exp_filter.h"
+#include "webrtc/base/analytics/exp_filter.h"
#include <math.h>
diff --git a/webrtc/base/exp_filter.h b/webrtc/base/analytics/exp_filter.h
similarity index 90%
rename from webrtc/base/exp_filter.h
rename to webrtc/base/analytics/exp_filter.h
index 174159b..e93de48 100644
--- a/webrtc/base/exp_filter.h
+++ b/webrtc/base/analytics/exp_filter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_BASE_EXP_FILTER_H_
-#define WEBRTC_BASE_EXP_FILTER_H_
+#ifndef WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
+#define WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
namespace rtc {
@@ -46,4 +46,4 @@
};
} // namespace rtc
-#endif // WEBRTC_BASE_EXP_FILTER_H_
+#endif // WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
diff --git a/webrtc/base/exp_filter_unittest.cc b/webrtc/base/analytics/exp_filter_unittest.cc
similarity index 95%
rename from webrtc/base/exp_filter_unittest.cc
rename to webrtc/base/analytics/exp_filter_unittest.cc
index f027808..48cb4cc 100644
--- a/webrtc/base/exp_filter_unittest.cc
+++ b/webrtc/base/analytics/exp_filter_unittest.cc
@@ -10,8 +10,8 @@
#include <math.h>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/exp_filter.h"
+#include "webrtc/base/analytics/exp_filter.h"
+#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index bfed73e..84bee3d 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -86,6 +86,8 @@
"signal_processing/splitting_filter.c",
"signal_processing/sqrt_of_one_minus_x_squared.c",
"signal_processing/vector_scaling_operations.c",
+ "smoothing_filter.cc",
+ "smoothing_filter.h",
"sparse_fir_filter.cc",
"sparse_fir_filter.h",
"vad/include/vad.h",
@@ -109,6 +111,7 @@
]
deps = [
+ "../base/analytics:rtc_analytics",
"../system_wrappers",
]
@@ -257,6 +260,7 @@
"ring_buffer_unittest.cc",
"signal_processing/real_fft_unittest.cc",
"signal_processing/signal_processing_unittest.cc",
+ "smoothing_filter_unittest.cc",
"sparse_fir_filter_unittest.cc",
"vad/vad_core_unittest.cc",
"vad/vad_filterbank_unittest.cc",
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h b/webrtc/common_audio/mocks/mock_smoothing_filter.h
similarity index 60%
rename from webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
rename to webrtc/common_audio/mocks/mock_smoothing_filter.h
index 745ca98..6b2991b 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
+++ b/webrtc/common_audio/mocks/mock_smoothing_filter.h
@@ -8,22 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_
+#ifndef WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
+#define WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
-#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
+#include "webrtc/common_audio/smoothing_filter.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
class MockSmoothingFilter : public SmoothingFilter {
public:
- virtual ~MockSmoothingFilter() { Die(); }
- MOCK_METHOD0(Die, void());
MOCK_METHOD1(AddSample, void(float));
MOCK_CONST_METHOD0(GetAverage, rtc::Optional<float>());
};
} // namespace webrtc
-#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_
+#endif // WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.cc b/webrtc/common_audio/smoothing_filter.cc
similarity index 95%
rename from webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.cc
rename to webrtc/common_audio/smoothing_filter.cc
index 8a81069..1cf9580 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.cc
+++ b/webrtc/common_audio/smoothing_filter.cc
@@ -10,7 +10,7 @@
#include <cmath>
-#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
+#include "webrtc/common_audio/smoothing_filter.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h b/webrtc/common_audio/smoothing_filter.h
similarity index 81%
rename from webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h
rename to webrtc/common_audio/smoothing_filter.h
index c4de7b5..64a83d1 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h
+++ b/webrtc/common_audio/smoothing_filter.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_SMOOTHING_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_SMOOTHING_FILTER_H_
+#ifndef WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
+#define WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/exp_filter.h"
#include "webrtc/base/optional.h"
#include "webrtc/system_wrappers/include/clock.h"
@@ -46,9 +46,9 @@
int64_t last_sample_time_ms_;
rtc::ExpFilter filter_;
- RTC_DISALLOW_COPY_AND_ASSIGN(SmoothingFilterImpl);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SmoothingFilterImpl);
};
} // namespace webrtc
-#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_SMOOTHING_FILTER_H_
+#endif // WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc b/webrtc/common_audio/smoothing_filter_unittest.cc
similarity index 97%
rename from webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
rename to webrtc/common_audio/smoothing_filter_unittest.cc
index af4e8d9..c80ffb6 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
+++ b/webrtc/common_audio/smoothing_filter_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
+#include "webrtc/common_audio/smoothing_filter.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 5537829..7d7a4e4 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -264,7 +264,6 @@
"audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc",
"audio_coding/audio_network_adaptor/mock/mock_controller.h",
"audio_coding/audio_network_adaptor/mock/mock_controller_manager.h",
- "audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc",
]
deps = [
"audio_coding:audio_network_adaptor",
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 0e78abf..0dd4162 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -709,6 +709,7 @@
":audio_encoder_interface",
":audio_network_adaptor",
"../../base:rtc_base_approved",
+ "../../base/analytics:rtc_analytics",
]
defines = []
@@ -764,8 +765,6 @@
"audio_network_adaptor/frame_length_controller.cc",
"audio_network_adaptor/frame_length_controller.h",
"audio_network_adaptor/include/audio_network_adaptor.h",
- "audio_network_adaptor/smoothing_filter.cc",
- "audio_network_adaptor/smoothing_filter.h",
]
deps = [
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h
index 0c2388b..62a3533 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h
@@ -14,8 +14,8 @@
#include <memory>
#include "webrtc/base/constructormagic.h"
+#include "webrtc/common_audio/smoothing_filter.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc
index 9bbec26..823763f 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
+#include "webrtc/common_audio/mocks/mock_smoothing_filter.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h"
-#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
@@ -55,7 +55,6 @@
std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
new NiceMock<MockSmoothingFilter>());
states.packet_loss_smoothed = mock_smoothing_filter.get();
- EXPECT_CALL(*states.packet_loss_smoothed, Die());
using Threshold = FecController::Config::Threshold;
states.controller.reset(new FecController(
FecController::Config(
@@ -262,7 +261,6 @@
std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
new NiceMock<MockSmoothingFilter>());
states.packet_loss_smoothed = mock_smoothing_filter.get();
- EXPECT_CALL(*states.packet_loss_smoothed, Die());
using Threshold = FecController::Config::Threshold;
states.controller.reset(new FecController(
FecController::Config(
@@ -293,7 +291,6 @@
std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
new NiceMock<MockSmoothingFilter>());
states.packet_loss_smoothed = mock_smoothing_filter.get();
- EXPECT_CALL(*states.packet_loss_smoothed, Die());
using Threshold = FecController::Config::Threshold;
EXPECT_DEATH(
states.controller.reset(new FecController(
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index 0f0958c..e9772f6 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -13,8 +13,8 @@
#include <algorithm>
#include <iterator>
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/base/checks.h"
-#include "webrtc/base/exp_filter.h"
#include "webrtc/base/safe_conversions.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
index 2966c29..b36b16d 100644
--- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
@@ -9,8 +9,8 @@
*/
#include <memory>
-#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
+#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 8f413d9..cde07e1 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -93,6 +93,7 @@
":webrtc_vp8",
":webrtc_vp9",
"../..:webrtc_common",
+ "../../base/analytics:rtc_analytics",
"../../common_video",
"../../system_wrappers",
]
@@ -124,6 +125,7 @@
}
deps = [
+ "../../base/analytics:rtc_analytics",
"../../common_video",
"../../system_wrappers",
]
diff --git a/webrtc/modules/video_coding/media_opt_util.h b/webrtc/modules/video_coding/media_opt_util.h
index 26f9332..bab1cbe 100644
--- a/webrtc/modules/video_coding/media_opt_util.h
+++ b/webrtc/modules/video_coding/media_opt_util.h
@@ -16,7 +16,7 @@
#include <memory>
-#include "webrtc/base/exp_filter.h"
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/modules/video_coding/internal_defines.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/modules/video_coding/utility/frame_dropper.h b/webrtc/modules/video_coding/utility/frame_dropper.h
index 20ff3d7..468b417 100644
--- a/webrtc/modules/video_coding/utility/frame_dropper.h
+++ b/webrtc/modules/video_coding/utility/frame_dropper.h
@@ -13,7 +13,7 @@
#include <cstddef>
-#include "webrtc/base/exp_filter.h"
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 9a75360..2906cd8 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -58,6 +58,7 @@
"..:webrtc_common",
"../base:rtc_base_approved",
"../base:rtc_task_queue",
+ "../base/analytics:rtc_analytics",
"../common_video",
"../logging:rtc_event_log_api",
"../modules/bitrate_controller",
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index bb89864..1670dc3 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -17,8 +17,8 @@
#include <list>
#include <map>
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/base/checks.h"
-#include "webrtc/base/exp_filter.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/system_wrappers/include/clock.h"
diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 3cd1fd5..f1a99d7 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -14,9 +14,9 @@
#include <list>
#include <memory>
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/optional.h"
-#include "webrtc/base/exp_filter.h"
#include "webrtc/base/sequenced_task_checker.h"
#include "webrtc/base/task_queue.h"
#include "webrtc/base/thread_annotations.h"
diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
index ec2fe4c..fff2d8d 100644
--- a/webrtc/video/send_statistics_proxy.h
+++ b/webrtc/video/send_statistics_proxy.h
@@ -16,8 +16,8 @@
#include <string>
#include <vector>
+#include "webrtc/base/analytics/exp_filter.h"
#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/exp_filter.h"
#include "webrtc/base/ratetracker.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"