| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ | 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ |
| 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ | 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ |
| 13 | 13 |
| 14 #include <string> | 14 #include <string> |
| 15 #include <vector> | 15 #include <vector> |
| 16 | 16 |
| 17 #include "webrtc/call.h" |
| 17 #include "webrtc/config.h" | 18 #include "webrtc/config.h" |
| 18 #include "webrtc/media/base/mediaengine.h" | 19 #include "webrtc/media/base/mediaengine.h" |
| 19 | 20 |
| 20 namespace webrtc { | 21 namespace webrtc { |
| 21 class AudioDecoderFactory; | 22 class AudioDecoderFactory; |
| 22 class AudioDeviceModule; | 23 class AudioDeviceModule; |
| 23 } | 24 } |
| 24 namespace cricket { | 25 namespace cricket { |
| 25 class WebRtcVideoDecoderFactory; | 26 class WebRtcVideoDecoderFactory; |
| 26 class WebRtcVideoEncoderFactory; | 27 class WebRtcVideoEncoderFactory; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 51 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); | 52 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); |
| 52 | 53 |
| 53 // Discard any extensions not validated by the 'supported' predicate. Duplicate | 54 // Discard any extensions not validated by the 'supported' predicate. Duplicate |
| 54 // extensions are removed if 'filter_redundant_extensions' is set, and also any | 55 // extensions are removed if 'filter_redundant_extensions' is set, and also any |
| 55 // mutually exclusive extensions (see implementation for details) are removed. | 56 // mutually exclusive extensions (see implementation for details) are removed. |
| 56 std::vector<webrtc::RtpExtension> FilterRtpExtensions( | 57 std::vector<webrtc::RtpExtension> FilterRtpExtensions( |
| 57 const std::vector<webrtc::RtpExtension>& extensions, | 58 const std::vector<webrtc::RtpExtension>& extensions, |
| 58 bool (*supported)(const std::string&), | 59 bool (*supported)(const std::string&), |
| 59 bool filter_redundant_extensions); | 60 bool filter_redundant_extensions); |
| 60 | 61 |
| 62 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( |
| 63 const Codec& codec); |
| 64 |
| 61 } // namespace cricket | 65 } // namespace cricket |
| 62 | 66 |
| 63 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ | 67 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ |
| OLD | NEW |