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

Side by Side Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc

Issue 1696853004: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/codecs/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
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 <memory>
11 #include <vector> 12 #include <vector>
12 13
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/common_audio/vad/mock/mock_vad.h" 15 #include "webrtc/common_audio/vad/mock/mock_vad.h"
16 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" 16 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
17 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h" 17 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
18 18
19 using ::testing::Return; 19 using ::testing::Return;
20 using ::testing::_; 20 using ::testing::_;
21 using ::testing::SetArgPointee; 21 using ::testing::SetArgPointee;
22 using ::testing::InSequence; 22 using ::testing::InSequence;
23 using ::testing::Invoke; 23 using ::testing::Invoke;
24 24
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 .WillOnce(Return(second_type)); 178 .WillOnce(Return(second_type));
179 } 179 }
180 encoded_info_.payload_type = 0; 180 encoded_info_.payload_type = 0;
181 for (size_t i = 0; i < blocks_per_frame; ++i) { 181 for (size_t i = 0; i < blocks_per_frame; ++i) {
182 Encode(); 182 Encode();
183 } 183 }
184 return encoded_info_.payload_type != kCngPayloadType; 184 return encoded_info_.payload_type != kCngPayloadType;
185 } 185 }
186 186
187 AudioEncoderCng::Config config_; 187 AudioEncoderCng::Config config_;
188 rtc::scoped_ptr<AudioEncoderCng> cng_; 188 std::unique_ptr<AudioEncoderCng> cng_;
189 MockAudioEncoder mock_encoder_; 189 MockAudioEncoder mock_encoder_;
190 MockVad* mock_vad_; // Ownership is transferred to |cng_|. 190 MockVad* mock_vad_; // Ownership is transferred to |cng_|.
191 uint32_t timestamp_; 191 uint32_t timestamp_;
192 int16_t audio_[kMaxNumSamples]; 192 int16_t audio_[kMaxNumSamples];
193 size_t num_audio_samples_10ms_; 193 size_t num_audio_samples_10ms_;
194 std::vector<uint8_t> encoded_; 194 std::vector<uint8_t> encoded_;
195 AudioEncoder::EncodedInfo encoded_info_; 195 AudioEncoder::EncodedInfo encoded_info_;
196 int sample_rate_hz_; 196 int sample_rate_hz_;
197 }; 197 };
198 198
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 .WillRepeatedly(Return(7U)); 457 .WillRepeatedly(Return(7U));
458 for (int i = 0; i < 6; ++i) 458 for (int i = 0; i < 6; ++i)
459 Encode(); 459 Encode();
460 EXPECT_DEATH(Encode(), 460 EXPECT_DEATH(Encode(),
461 "Frame size cannot be larger than 60 ms when using VAD/CNG."); 461 "Frame size cannot be larger than 60 ms when using VAD/CNG.");
462 } 462 }
463 463
464 #endif // GTEST_HAS_DEATH_TEST 464 #endif // GTEST_HAS_DEATH_TEST
465 465
466 } // namespace webrtc 466 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698