webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc - Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/.

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/acm2/audio_coding_module_unittest.cc

Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/. (Closed)

Patch Set: More backwards-compatibility! Created 3 years, 8 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:

Index: webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc

diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc

index be584639ce4c47c1ae339c5b2661da2fea4b3e1c..e8a6c398e2a3354d26578d1a00a356bf0ebf669d 100644

--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc

+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc

@@ -13,6 +13,7 @@

#include <memory>

#include <vector>

+#include "webrtc/api/audio_codecs/audio_encoder.h"

#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"

#include "webrtc/base/criticalsection.h"

#include "webrtc/base/md5digest.h"

@@ -20,12 +21,10 @@

#include "webrtc/base/thread_annotations.h"

#include "webrtc/modules/audio_coding/acm2/acm_receive_test.h"

#include "webrtc/modules/audio_coding/acm2/acm_send_test.h"

-#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"

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

#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"

#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"

#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"

-#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"

#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"

#include "webrtc/modules/audio_coding/include/audio_coding_module.h"

#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"

@@ -44,6 +43,7 @@

#include "webrtc/system_wrappers/include/sleep.h"

#include "webrtc/test/gtest.h"

#include "webrtc/test/mock_audio_decoder.h"

+#include "webrtc/test/mock_audio_encoder.h"

#include "webrtc/test/testsupport/fileutils.h"

using ::testing::AtLeast;