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

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

Issue 2027993002: NetEq: Ask AudioDecoder for sample rate instead of passing it as an argument (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@samprate1
Patch Set: rebase 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
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc ('k') | no next file » | 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) 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
(...skipping 16 matching lines...) Expand all
27 channels_(decoder_->Channels()) { 27 channels_(decoder_->Channels()) {
28 NetEq::Config config; 28 NetEq::Config config;
29 config.sample_rate_hz = sample_rate_hz_; 29 config.sample_rate_hz = sample_rate_hz_;
30 neteq_.reset(NetEq::Create(config, CreateBuiltinAudioDecoderFactory())); 30 neteq_.reset(NetEq::Create(config, CreateBuiltinAudioDecoderFactory()));
31 printf("%" PRIuS "\n", channels_); 31 printf("%" PRIuS "\n", channels_);
32 } 32 }
33 33
34 void NetEqExternalDecoderTest::Init() { 34 void NetEqExternalDecoderTest::Init() {
35 ASSERT_EQ(NetEq::kOK, 35 ASSERT_EQ(NetEq::kOK,
36 neteq_->RegisterExternalDecoder(decoder_, codec_, name_, 36 neteq_->RegisterExternalDecoder(decoder_, codec_, name_,
37 kPayloadType, sample_rate_hz_)); 37 kPayloadType));
38 } 38 }
39 39
40 void NetEqExternalDecoderTest::InsertPacket( 40 void NetEqExternalDecoderTest::InsertPacket(
41 WebRtcRTPHeader rtp_header, 41 WebRtcRTPHeader rtp_header,
42 rtc::ArrayView<const uint8_t> payload, 42 rtc::ArrayView<const uint8_t> payload,
43 uint32_t receive_timestamp) { 43 uint32_t receive_timestamp) {
44 ASSERT_EQ(NetEq::kOK, 44 ASSERT_EQ(NetEq::kOK,
45 neteq_->InsertPacket(rtp_header, payload, receive_timestamp)); 45 neteq_->InsertPacket(rtp_header, payload, receive_timestamp));
46 } 46 }
47 47
48 void NetEqExternalDecoderTest::GetOutputAudio(AudioFrame* output) { 48 void NetEqExternalDecoderTest::GetOutputAudio(AudioFrame* output) {
49 // Get audio from regular instance. 49 // Get audio from regular instance.
50 bool muted; 50 bool muted;
51 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(output, &muted)); 51 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(output, &muted));
52 ASSERT_FALSE(muted); 52 ASSERT_FALSE(muted);
53 EXPECT_EQ(channels_, output->num_channels_); 53 EXPECT_EQ(channels_, output->num_channels_);
54 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000), 54 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000),
55 output->samples_per_channel_); 55 output->samples_per_channel_);
56 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz()); 56 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz());
57 } 57 }
58 58
59 } // namespace test 59 } // namespace test
60 } // namespace webrtc 60 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698