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

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc

Issue 1992763002: Moved injection of AudioDecoderFactory into voe::Channel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-1
Patch Set: Addressed nit. Created 4 years, 6 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 11
12 #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" 12 #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
13 13
14 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 #include "webrtc/base/format_macros.h" 16 #include "webrtc/base/format_macros.h"
16 17
17 namespace webrtc { 18 namespace webrtc {
18 namespace test { 19 namespace test {
19 20
20 NetEqExternalDecoderTest::NetEqExternalDecoderTest(NetEqDecoder codec, 21 NetEqExternalDecoderTest::NetEqExternalDecoderTest(NetEqDecoder codec,
21 AudioDecoder* decoder) 22 AudioDecoder* decoder)
22 : codec_(codec), 23 : codec_(codec),
23 decoder_(decoder), 24 decoder_(decoder),
24 sample_rate_hz_(CodecSampleRateHz(codec_)), 25 sample_rate_hz_(CodecSampleRateHz(codec_)),
25 channels_(decoder_->Channels()) { 26 channels_(decoder_->Channels()) {
26 NetEq::Config config; 27 NetEq::Config config;
27 config.sample_rate_hz = sample_rate_hz_; 28 config.sample_rate_hz = sample_rate_hz_;
28 neteq_.reset(NetEq::Create(config)); 29 neteq_.reset(NetEq::Create(config, CreateBuiltinAudioDecoderFactory()));
29 printf("%" PRIuS "\n", channels_); 30 printf("%" PRIuS "\n", channels_);
30 } 31 }
31 32
32 void NetEqExternalDecoderTest::Init() { 33 void NetEqExternalDecoderTest::Init() {
33 ASSERT_EQ(NetEq::kOK, 34 ASSERT_EQ(NetEq::kOK,
34 neteq_->RegisterExternalDecoder(decoder_, codec_, name_, 35 neteq_->RegisterExternalDecoder(decoder_, codec_, name_,
35 kPayloadType, sample_rate_hz_)); 36 kPayloadType, sample_rate_hz_));
36 } 37 }
37 38
38 void NetEqExternalDecoderTest::InsertPacket( 39 void NetEqExternalDecoderTest::InsertPacket(
(...skipping 10 matching lines...) Expand all
49 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(output, &muted)); 50 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(output, &muted));
50 ASSERT_FALSE(muted); 51 ASSERT_FALSE(muted);
51 EXPECT_EQ(channels_, output->num_channels_); 52 EXPECT_EQ(channels_, output->num_channels_);
52 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000), 53 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000),
53 output->samples_per_channel_); 54 output->samples_per_channel_);
54 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz()); 55 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz());
55 } 56 }
56 57
57 } // namespace test 58 } // namespace test
58 } // namespace webrtc 59 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698