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

Unified Diff: webrtc/media/engine/nullwebrtcvideoengine_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
diff --git a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
index f1b4f2f65429c326288aeba7318bba05d6e1e60b..342b5a89368dc0d9f6ed2b865bcc4f286405149c 100644
--- a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
@@ -12,6 +12,7 @@
#include "webrtc/media/engine/webrtcvoiceengine.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_audio_decoder_factory.h"
+#include "webrtc/test/mock_audio_encoder_factory.h"
namespace cricket {
@@ -20,12 +21,15 @@ class WebRtcMediaEngineNullVideo
public:
WebRtcMediaEngineNullVideo(
webrtc::AudioDeviceModule* adm,
+ const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
+ audio_encoder_factory,
const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
audio_decoder_factory,
WebRtcVideoEncoderFactory* video_encoder_factory,
WebRtcVideoDecoderFactory* video_decoder_factory)
: CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
adm,
+ audio_encoder_factory,
audio_decoder_factory,
nullptr) {
video_.SetExternalDecoderFactory(video_decoder_factory);
@@ -37,8 +41,8 @@ class WebRtcMediaEngineNullVideo
// required by CompositeMediaEngine.
TEST(NullWebRtcVideoEngineTest, CheckInterface) {
WebRtcMediaEngineNullVideo engine(
- nullptr, webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr,
- nullptr);
+ nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, nullptr);
EXPECT_TRUE(engine.Init());
}
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698