Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: webrtc/common_audio/audio_converter_unittest.cc

Issue 1712513002: Replace scoped_ptr with unique_ptr in webrtc/common_audio/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/common_audio/audio_converter.cc ('k') | webrtc/common_audio/audio_ring_buffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <cmath> 11 #include <cmath>
12 #include <algorithm> 12 #include <algorithm>
13 #include <memory>
13 #include <vector> 14 #include <vector>
14 15
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/base/arraysize.h" 17 #include "webrtc/base/arraysize.h"
17 #include "webrtc/base/format_macros.h" 18 #include "webrtc/base/format_macros.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/common_audio/audio_converter.h" 19 #include "webrtc/common_audio/audio_converter.h"
20 #include "webrtc/common_audio/channel_buffer.h" 20 #include "webrtc/common_audio/channel_buffer.h"
21 #include "webrtc/common_audio/resampler/push_sinc_resampler.h" 21 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 typedef rtc::scoped_ptr<ChannelBuffer<float>> ScopedBuffer; 25 typedef std::unique_ptr<ChannelBuffer<float>> ScopedBuffer;
26 26
27 // Sets the signal value to increase by |data| with every sample. 27 // Sets the signal value to increase by |data| with every sample.
28 ScopedBuffer CreateBuffer(const std::vector<float>& data, size_t frames) { 28 ScopedBuffer CreateBuffer(const std::vector<float>& data, size_t frames) {
29 const size_t num_channels = data.size(); 29 const size_t num_channels = data.size();
30 ScopedBuffer sb(new ChannelBuffer<float>(frames, num_channels)); 30 ScopedBuffer sb(new ChannelBuffer<float>(frames, num_channels));
31 for (size_t i = 0; i < num_channels; ++i) 31 for (size_t i = 0; i < num_channels; ++i)
32 for (size_t j = 0; j < frames; ++j) 32 for (size_t j = 0; j < frames; ++j)
33 sb->channels()[i][j] = data[i] * j; 33 sb->channels()[i][j] = data[i] * j;
34 return sb; 34 return sb;
35 } 35 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 // The sinc resampler has a known delay, which we compute here. 126 // The sinc resampler has a known delay, which we compute here.
127 const size_t delay_frames = src_sample_rate_hz == dst_sample_rate_hz ? 0 : 127 const size_t delay_frames = src_sample_rate_hz == dst_sample_rate_hz ? 0 :
128 static_cast<size_t>( 128 static_cast<size_t>(
129 PushSincResampler::AlgorithmicDelaySeconds(src_sample_rate_hz) * 129 PushSincResampler::AlgorithmicDelaySeconds(src_sample_rate_hz) *
130 dst_sample_rate_hz); 130 dst_sample_rate_hz);
131 // SNR reported on the same line later. 131 // SNR reported on the same line later.
132 printf("(%" PRIuS ", %d Hz) -> (%" PRIuS ", %d Hz) ", 132 printf("(%" PRIuS ", %d Hz) -> (%" PRIuS ", %d Hz) ",
133 src_channels, src_sample_rate_hz, dst_channels, dst_sample_rate_hz); 133 src_channels, src_sample_rate_hz, dst_channels, dst_sample_rate_hz);
134 134
135 rtc::scoped_ptr<AudioConverter> converter = AudioConverter::Create( 135 std::unique_ptr<AudioConverter> converter = AudioConverter::Create(
136 src_channels, src_frames, dst_channels, dst_frames); 136 src_channels, src_frames, dst_channels, dst_frames);
137 converter->Convert(src_buffer->channels(), src_buffer->size(), 137 converter->Convert(src_buffer->channels(), src_buffer->size(),
138 dst_buffer->channels(), dst_buffer->size()); 138 dst_buffer->channels(), dst_buffer->size());
139 139
140 EXPECT_LT(43.f, 140 EXPECT_LT(43.f,
141 ComputeSNR(*ref_buffer.get(), *dst_buffer.get(), delay_frames)); 141 ComputeSNR(*ref_buffer.get(), *dst_buffer.get(), delay_frames));
142 } 142 }
143 143
144 TEST(AudioConverterTest, ConversionsPassSNRThreshold) { 144 TEST(AudioConverterTest, ConversionsPassSNRThreshold) {
145 const int kSampleRates[] = {8000, 16000, 32000, 44100, 48000}; 145 const int kSampleRates[] = {8000, 16000, 32000, 44100, 48000};
146 const size_t kChannels[] = {1, 2}; 146 const size_t kChannels[] = {1, 2};
147 for (size_t src_rate = 0; src_rate < arraysize(kSampleRates); ++src_rate) { 147 for (size_t src_rate = 0; src_rate < arraysize(kSampleRates); ++src_rate) {
148 for (size_t dst_rate = 0; dst_rate < arraysize(kSampleRates); ++dst_rate) { 148 for (size_t dst_rate = 0; dst_rate < arraysize(kSampleRates); ++dst_rate) {
149 for (size_t src_channel = 0; src_channel < arraysize(kChannels); 149 for (size_t src_channel = 0; src_channel < arraysize(kChannels);
150 ++src_channel) { 150 ++src_channel) {
151 for (size_t dst_channel = 0; dst_channel < arraysize(kChannels); 151 for (size_t dst_channel = 0; dst_channel < arraysize(kChannels);
152 ++dst_channel) { 152 ++dst_channel) {
153 RunAudioConverterTest(kChannels[src_channel], kSampleRates[src_rate], 153 RunAudioConverterTest(kChannels[src_channel], kSampleRates[src_rate],
154 kChannels[dst_channel], kSampleRates[dst_rate]); 154 kChannels[dst_channel], kSampleRates[dst_rate]);
155 } 155 }
156 } 156 }
157 } 157 }
158 } 158 }
159 } 159 }
160 160
161 } // namespace webrtc 161 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/common_audio/audio_converter.cc ('k') | webrtc/common_audio/audio_ring_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698