| Index: webrtc/common_audio/fir_filter_unittest.cc
|
| diff --git a/webrtc/common_audio/fir_filter_unittest.cc b/webrtc/common_audio/fir_filter_unittest.cc
|
| index 9dffcb615ff85e8710939f714007f95e63bb9675..13f79d9482e6ba2d0014024de166a2611217f8e3 100644
|
| --- a/webrtc/common_audio/fir_filter_unittest.cc
|
| +++ b/webrtc/common_audio/fir_filter_unittest.cc
|
| @@ -12,9 +12,8 @@
|
|
|
| #include <string.h>
|
|
|
| -#include <memory>
|
| -
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "webrtc/base/scoped_ptr.h"
|
|
|
| namespace webrtc {
|
| namespace {
|
| @@ -41,7 +40,7 @@
|
| TEST(FIRFilterTest, FilterAsIdentity) {
|
| const float kCoefficients[] = {1.f, 0.f, 0.f, 0.f, 0.f};
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, kInputLength));
|
| filter->Filter(kInput, kInputLength, output);
|
|
|
| @@ -51,7 +50,7 @@
|
| TEST(FIRFilterTest, FilterUsedAsScalarMultiplication) {
|
| const float kCoefficients[] = {5.f, 0.f, 0.f, 0.f, 0.f};
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, kInputLength));
|
| filter->Filter(kInput, kInputLength, output);
|
|
|
| @@ -64,7 +63,7 @@
|
| TEST(FIRFilterTest, FilterUsedAsInputShifting) {
|
| const float kCoefficients[] = {0.f, 0.f, 0.f, 0.f, 1.f};
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, kInputLength));
|
| filter->Filter(kInput, kInputLength, output);
|
|
|
| @@ -77,7 +76,7 @@
|
|
|
| TEST(FIRFilterTest, FilterUsedAsArbitraryWeighting) {
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, kInputLength));
|
| filter->Filter(kInput, kInputLength, output);
|
|
|
| @@ -90,7 +89,7 @@
|
|
|
| TEST(FIRFilterTest, FilterInLengthLesserOrEqualToCoefficientsLength) {
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, 2));
|
| filter->Filter(kInput, 2, output);
|
|
|
| @@ -107,7 +106,7 @@
|
|
|
| TEST(FIRFilterTest, MultipleFilterCalls) {
|
| float output[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, 3));
|
| filter->Filter(kInput, 2, output);
|
| EXPECT_FLOAT_EQ(0.2f, output[0]);
|
| @@ -138,7 +137,7 @@
|
|
|
| TEST(FIRFilterTest, VerifySampleBasedVsBlockBasedFiltering) {
|
| float output_block_based[kInputLength];
|
| - std::unique_ptr<FIRFilter> filter(
|
| + rtc::scoped_ptr<FIRFilter> filter(
|
| FIRFilter::Create(kCoefficients, kCoefficientsLength, kInputLength));
|
| filter->Filter(kInput, kInputLength, output_block_based);
|
|
|
| @@ -163,7 +162,7 @@
|
| sizeof(kConstantInput[0]);
|
|
|
| float output[kConstantInputLength];
|
| - std::unique_ptr<FIRFilter> filter(FIRFilter::Create(
|
| + rtc::scoped_ptr<FIRFilter> filter(FIRFilter::Create(
|
| kCoefficients, kCoefficientsLength, kConstantInputLength));
|
| filter->Filter(kConstantInput, kConstantInputLength, output);
|
| EXPECT_FLOAT_EQ(1.f, output[0]);
|
| @@ -182,7 +181,7 @@
|
| sizeof(kHighFrequencyInput[0]);
|
|
|
| float output[kHighFrequencyInputLength];
|
| - std::unique_ptr<FIRFilter> filter(FIRFilter::Create(
|
| + rtc::scoped_ptr<FIRFilter> filter(FIRFilter::Create(
|
| kCoefficients, kCoefficientsLength, kHighFrequencyInputLength));
|
| filter->Filter(kHighFrequencyInput, kHighFrequencyInputLength, output);
|
| EXPECT_FLOAT_EQ(-1.f, output[0]);
|
| @@ -194,7 +193,7 @@
|
| TEST(FIRFilterTest, SameOutputWhenSwapedCoefficientsAndInput) {
|
| float output[kCoefficientsLength];
|
| float output_swaped[kCoefficientsLength];
|
| - std::unique_ptr<FIRFilter> filter(FIRFilter::Create(
|
| + rtc::scoped_ptr<FIRFilter> filter(FIRFilter::Create(
|
| kCoefficients, kCoefficientsLength, kCoefficientsLength));
|
| // Use kCoefficientsLength for in_length to get same-length outputs.
|
| filter->Filter(kInput, kCoefficientsLength, output);
|
|
|