OLD | NEW |
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 |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 class WebRtcMediaEngine2 | 24 class WebRtcMediaEngine2 |
25 #ifdef HAVE_WEBRTC_VIDEO | 25 #ifdef HAVE_WEBRTC_VIDEO |
26 : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> { | 26 : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> { |
27 #else | 27 #else |
28 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> { | 28 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> { |
29 #endif | 29 #endif |
30 public: | 30 public: |
31 WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm, | 31 WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm, |
32 WebRtcVideoEncoderFactory* encoder_factory, | 32 WebRtcVideoEncoderFactory* encoder_factory, |
33 WebRtcVideoDecoderFactory* decoder_factory) { | 33 WebRtcVideoDecoderFactory* decoder_factory) |
34 voice_.SetAudioDeviceModule(adm); | 34 #ifdef HAVE_WEBRTC_VIDEO |
| 35 : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>(adm) { |
| 36 #else |
| 37 : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(adm) { |
| 38 #endif |
35 video_.SetExternalDecoderFactory(decoder_factory); | 39 video_.SetExternalDecoderFactory(decoder_factory); |
36 video_.SetExternalEncoderFactory(encoder_factory); | 40 video_.SetExternalEncoderFactory(encoder_factory); |
37 } | 41 } |
38 }; | 42 }; |
39 | 43 |
40 } // namespace cricket | 44 } // namespace cricket |
41 | 45 |
42 cricket::MediaEngineInterface* CreateWebRtcMediaEngine( | 46 cricket::MediaEngineInterface* CreateWebRtcMediaEngine( |
43 webrtc::AudioDeviceModule* adm, | 47 webrtc::AudioDeviceModule* adm, |
44 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 48 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 kRtpTransportSequenceNumberHeaderExtension, | 141 kRtpTransportSequenceNumberHeaderExtension, |
138 kRtpAbsoluteSenderTimeHeaderExtension, | 142 kRtpAbsoluteSenderTimeHeaderExtension, |
139 kRtpTimestampOffsetHeaderExtension | 143 kRtpTimestampOffsetHeaderExtension |
140 }; | 144 }; |
141 DiscardRedundantExtensions(&result, kBweExtensionPriorities); | 145 DiscardRedundantExtensions(&result, kBweExtensionPriorities); |
142 } | 146 } |
143 | 147 |
144 return result; | 148 return result; |
145 } | 149 } |
146 } // namespace cricket | 150 } // namespace cricket |
OLD | NEW |