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

Side by Side Diff: webrtc/media/engine/nullwebrtcvideoengine_unittest.cc

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Parental Advisory: Explicit Content 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/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine.h » ('j') | 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 #include "webrtc/media/engine/nullwebrtcvideoengine.h" 13 #include "webrtc/media/engine/nullwebrtcvideoengine.h"
14 #include "webrtc/media/engine/webrtcvoiceengine.h" 14 #include "webrtc/media/engine/webrtcvoiceengine.h"
15 15
16 namespace cricket { 16 namespace cricket {
17 17
18 class WebRtcMediaEngineNullVideo 18 class WebRtcMediaEngineNullVideo
19 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> { 19 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
20 public: 20 public:
21 WebRtcMediaEngineNullVideo(webrtc::AudioDeviceModule* adm, 21 WebRtcMediaEngineNullVideo(
22 WebRtcVideoEncoderFactory* encoder_factory, 22 webrtc::AudioDeviceModule* adm,
23 WebRtcVideoDecoderFactory* decoder_factory) 23 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
24 : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(adm) { 24 audio_decoder_factory,
25 video_.SetExternalDecoderFactory(decoder_factory); 25 WebRtcVideoEncoderFactory* video_encoder_factory,
26 video_.SetExternalEncoderFactory(encoder_factory); 26 WebRtcVideoDecoderFactory* video_decoder_factory)
27 : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
28 adm, audio_decoder_factory) {
29 video_.SetExternalDecoderFactory(video_decoder_factory);
30 video_.SetExternalEncoderFactory(video_encoder_factory);
27 } 31 }
28 }; 32 };
29 33
30 // Simple test to check if NullWebRtcVideoEngine implements the methods 34 // Simple test to check if NullWebRtcVideoEngine implements the methods
31 // required by CompositeMediaEngine. 35 // required by CompositeMediaEngine.
32 TEST(NullWebRtcVideoEngineTest, CheckInterface) { 36 TEST(NullWebRtcVideoEngineTest, CheckInterface) {
33 WebRtcMediaEngineNullVideo engine(nullptr, nullptr, nullptr); 37 WebRtcMediaEngineNullVideo engine(nullptr, nullptr, nullptr, nullptr);
34 EXPECT_TRUE(engine.Init()); 38 EXPECT_TRUE(engine.Init());
35 } 39 }
36 40
37 } // namespace cricket 41 } // namespace cricket
OLDNEW
« 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