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

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 "webrtc/modules/audio_coding/acm2/acm_receiver.h" 11 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
12 12
13 #include <algorithm> // std::min 13 #include <algorithm> // std::min
14 #include <memory> 14 #include <memory>
15 15
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/safe_conversions.h" 18 #include "webrtc/base/safe_conversions.h"
19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
20 #include "webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h" 20 #include "webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h"
21 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
21 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" 22 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
22 #include "webrtc/system_wrappers/include/clock.h" 23 #include "webrtc/system_wrappers/include/clock.h"
23 #include "webrtc/test/test_suite.h" 24 #include "webrtc/test/test_suite.h"
24 #include "webrtc/test/testsupport/fileutils.h" 25 #include "webrtc/test/testsupport/fileutils.h"
25 26
26 namespace webrtc { 27 namespace webrtc {
27 28
28 namespace acm2 { 29 namespace acm2 {
29 namespace { 30 namespace {
30 31
(...skipping 22 matching lines...) Expand all
53 } // namespace 54 } // namespace
54 55
55 class AcmReceiverTestOldApi : public AudioPacketizationCallback, 56 class AcmReceiverTestOldApi : public AudioPacketizationCallback,
56 public ::testing::Test { 57 public ::testing::Test {
57 protected: 58 protected:
58 AcmReceiverTestOldApi() 59 AcmReceiverTestOldApi()
59 : timestamp_(0), 60 : timestamp_(0),
60 packet_sent_(false), 61 packet_sent_(false),
61 last_packet_send_timestamp_(timestamp_), 62 last_packet_send_timestamp_(timestamp_),
62 last_frame_type_(kEmptyFrame) { 63 last_frame_type_(kEmptyFrame) {
64 config_.decoder_factory = CreateBuiltinAudioDecoderFactory();
63 } 65 }
64 66
65 ~AcmReceiverTestOldApi() {} 67 ~AcmReceiverTestOldApi() {}
66 68
67 void SetUp() override { 69 void SetUp() override {
68 acm_.reset(new AudioCodingModuleImpl(config_)); 70 acm_.reset(new AudioCodingModuleImpl(config_));
69 receiver_.reset(new AcmReceiver(config_)); 71 receiver_.reset(new AcmReceiver(config_));
70 ASSERT_TRUE(receiver_.get() != NULL); 72 ASSERT_TRUE(receiver_.get() != NULL);
71 ASSERT_TRUE(acm_.get() != NULL); 73 ASSERT_TRUE(acm_.get() != NULL);
72 codecs_ = RentACodec::Database(); 74 codecs_ = RentACodec::Database();
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 receiver_->last_packet_sample_rate_hz()); 500 receiver_->last_packet_sample_rate_hz());
499 EXPECT_EQ(0, receiver_->LastAudioCodec(&codec)); 501 EXPECT_EQ(0, receiver_->LastAudioCodec(&codec));
500 EXPECT_TRUE(CodecsEqual(c.inst, codec)); 502 EXPECT_TRUE(CodecsEqual(c.inst, codec));
501 } 503 }
502 } 504 }
503 #endif 505 #endif
504 506
505 } // namespace acm2 507 } // namespace acm2
506 508
507 } // namespace webrtc 509 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receiver.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698