| 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 |
| 11 #include "webrtc/media/webrtc/webrtcmediaengine.h" | 11 #include "webrtc/media/engine/webrtcmediaengine.h" |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 | 14 |
| 15 #ifdef HAVE_WEBRTC_VIDEO | 15 #ifdef HAVE_WEBRTC_VIDEO |
| 16 #include "webrtc/media/webrtc/webrtcvideoengine2.h" | 16 #include "webrtc/media/engine/webrtcvideoengine2.h" |
| 17 #else | 17 #else |
| 18 #include "webrtc/media/webrtc/nullwebrtcvideoengine.h" | 18 #include "webrtc/media/engine/nullwebrtcvideoengine.h" |
| 19 #endif | 19 #endif |
| 20 #include "webrtc/media/webrtc/webrtcvoiceengine.h" | 20 #include "webrtc/media/engine/webrtcvoiceengine.h" |
| 21 | 21 |
| 22 namespace cricket { | 22 namespace cricket { |
| 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: |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 kRtpTransportSequenceNumberHeaderExtension, | 137 kRtpTransportSequenceNumberHeaderExtension, |
| 138 kRtpAbsoluteSenderTimeHeaderExtension, | 138 kRtpAbsoluteSenderTimeHeaderExtension, |
| 139 kRtpTimestampOffsetHeaderExtension | 139 kRtpTimestampOffsetHeaderExtension |
| 140 }; | 140 }; |
| 141 DiscardRedundantExtensions(&result, kBweExtensionPriorities); | 141 DiscardRedundantExtensions(&result, kBweExtensionPriorities); |
| 142 } | 142 } |
| 143 | 143 |
| 144 return result; | 144 return result; |
| 145 } | 145 } |
| 146 } // namespace cricket | 146 } // namespace cricket |
| OLD | NEW |