webrtc/modules/audio_coding/neteq/neteq_unittest.cc - Issue 1992763002: Moved injection of AudioDecoderFactory into voe::Channel.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/neteq/neteq_unittest.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, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/neteq_unittest.cc

diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

index 4a6f505fc639c4edb0b515f712a471ec0c9237cc..fedf3f6f1f65148ed95fe56c44551f6e86e4b988 100644

--- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

@@ -24,6 +24,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "webrtc/base/sha1digest.h"

#include "webrtc/base/stringencode.h"

+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"

#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"

#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"

#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"

@@ -315,7 +316,7 @@ NetEqDecodingTest::NetEqDecodingTest()

}

void NetEqDecodingTest::SetUp() {

- neteq_ = NetEq::Create(config_);

+ neteq_ = NetEq::Create(config_, CreateBuiltinAudioDecoderFactory());

NetEqNetworkStatistics stat;

ASSERT_EQ(0, neteq_->NetworkStatistics(&stat));

algorithmic_delay_ms_ = stat.current_buffer_size_ms;

@@ -1666,7 +1667,7 @@ class NetEqDecodingTestTwoInstances : public NetEqDecodingTest {

}

void CreateSecondInstance() {

- neteq2_.reset(NetEq::Create(config2_));

+ neteq2_.reset(NetEq::Create(config2_, CreateBuiltinAudioDecoderFactory()));

ASSERT_TRUE(neteq2_);

LoadDecoders(neteq2_.get());

}