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

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

Issue 2069643002: Added backwards compatible version of WebRtcMediaEngineFactory::Create. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added tests. 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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/media/engine/webrtcmediaengine.h" 11 #include "webrtc/media/engine/webrtcmediaengine.h"
12 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
12 13
13 #include <algorithm> 14 #include <algorithm>
14 15
15 #ifdef HAVE_WEBRTC_VIDEO 16 #ifdef HAVE_WEBRTC_VIDEO
16 #include "webrtc/media/engine/webrtcvideoengine2.h" 17 #include "webrtc/media/engine/webrtcvideoengine2.h"
17 #else 18 #else
18 #include "webrtc/media/engine/nullwebrtcvideoengine.h" 19 #include "webrtc/media/engine/nullwebrtcvideoengine.h"
19 #endif 20 #endif
20 #include "webrtc/media/engine/webrtcvoiceengine.h" 21 #include "webrtc/media/engine/webrtcvoiceengine.h"
21 22
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return new cricket::WebRtcMediaEngine2( 57 return new cricket::WebRtcMediaEngine2(
57 adm, audio_decoder_factory, video_encoder_factory, video_decoder_factory); 58 adm, audio_decoder_factory, video_encoder_factory, video_decoder_factory);
58 } 59 }
59 60
60 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) { 61 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
61 delete media_engine; 62 delete media_engine;
62 } 63 }
63 64
64 namespace cricket { 65 namespace cricket {
65 66
67 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the
68 // audio decoder factory is fully plumbed and used throughout WebRTC.
69 // See: crbug.com/webrtc/6000
70 MediaEngineInterface* WebRtcMediaEngineFactory::Create(
71 webrtc::AudioDeviceModule* adm,
72 WebRtcVideoEncoderFactory* video_encoder_factory,
73 WebRtcVideoDecoderFactory* video_decoder_factory) {
74 return CreateWebRtcMediaEngine(adm,
75 webrtc::CreateBuiltinAudioDecoderFactory(),
76 video_encoder_factory, video_decoder_factory);
77 }
78
66 // Used by PeerConnectionFactory to create a media engine passed into 79 // Used by PeerConnectionFactory to create a media engine passed into
67 // ChannelManager. 80 // ChannelManager.
68 MediaEngineInterface* WebRtcMediaEngineFactory::Create( 81 MediaEngineInterface* WebRtcMediaEngineFactory::Create(
69 webrtc::AudioDeviceModule* adm, 82 webrtc::AudioDeviceModule* adm,
70 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& 83 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
71 audio_decoder_factory, 84 audio_decoder_factory,
72 WebRtcVideoEncoderFactory* video_encoder_factory, 85 WebRtcVideoEncoderFactory* video_encoder_factory,
73 WebRtcVideoDecoderFactory* video_decoder_factory) { 86 WebRtcVideoDecoderFactory* video_decoder_factory) {
74 return CreateWebRtcMediaEngine(adm, audio_decoder_factory, 87 return CreateWebRtcMediaEngine(adm, audio_decoder_factory,
75 video_encoder_factory, video_decoder_factory); 88 video_encoder_factory, video_decoder_factory);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 static const char* kBweExtensionPriorities[] = { 162 static const char* kBweExtensionPriorities[] = {
150 webrtc::RtpExtension::kTransportSequenceNumberUri, 163 webrtc::RtpExtension::kTransportSequenceNumberUri,
151 webrtc::RtpExtension::kAbsSendTimeUri, 164 webrtc::RtpExtension::kAbsSendTimeUri,
152 webrtc::RtpExtension::kTimestampOffsetUri}; 165 webrtc::RtpExtension::kTimestampOffsetUri};
153 DiscardRedundantExtensions(&result, kBweExtensionPriorities); 166 DiscardRedundantExtensions(&result, kBweExtensionPriorities);
154 } 167 }
155 168
156 return result; 169 return result;
157 } 170 }
158 } // namespace cricket 171 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcmediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698