| 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/call.h" | 17 #include "webrtc/call/call.h" |
| 18 #include "webrtc/config.h" | 18 #include "webrtc/config.h" |
| 19 #include "webrtc/media/base/mediaengine.h" | 19 #include "webrtc/media/base/mediaengine.h" |
| 20 | 20 |
| 21 namespace webrtc { | 21 namespace webrtc { |
| 22 class AudioDecoderFactory; | 22 class AudioDecoderFactory; |
| 23 class AudioDeviceModule; | 23 class AudioDeviceModule; |
| 24 class AudioMixer; |
| 24 } | 25 } |
| 25 namespace cricket { | 26 namespace cricket { |
| 26 class WebRtcVideoDecoderFactory; | 27 class WebRtcVideoDecoderFactory; |
| 27 class WebRtcVideoEncoderFactory; | 28 class WebRtcVideoEncoderFactory; |
| 28 } | 29 } |
| 29 | 30 |
| 30 namespace cricket { | 31 namespace cricket { |
| 31 | 32 |
| 32 class WebRtcMediaEngineFactory { | 33 class WebRtcMediaEngineFactory { |
| 33 public: | 34 public: |
| 34 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the | 35 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the |
| 35 // audio decoder factory is fully plumbed and used throughout WebRTC. | 36 // audio decoder factory is fully plumbed and used throughout WebRTC. |
| 36 // See: crbug.com/webrtc/6000 | 37 // See: crbug.com/webrtc/6000 |
| 37 static MediaEngineInterface* Create( | 38 static MediaEngineInterface* Create( |
| 38 webrtc::AudioDeviceModule* adm, | 39 webrtc::AudioDeviceModule* adm, |
| 39 WebRtcVideoEncoderFactory* video_encoder_factory, | 40 WebRtcVideoEncoderFactory* video_encoder_factory, |
| 40 WebRtcVideoDecoderFactory* video_decoder_factory); | 41 WebRtcVideoDecoderFactory* video_decoder_factory); |
| 41 | 42 |
| 42 static MediaEngineInterface* Create( | 43 static MediaEngineInterface* Create( |
| 43 webrtc::AudioDeviceModule* adm, | 44 webrtc::AudioDeviceModule* adm, |
| 44 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& | 45 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| 45 audio_decoder_factory, | 46 audio_decoder_factory, |
| 46 WebRtcVideoEncoderFactory* video_encoder_factory, | 47 WebRtcVideoEncoderFactory* video_encoder_factory, |
| 47 WebRtcVideoDecoderFactory* video_decoder_factory); | 48 WebRtcVideoDecoderFactory* video_decoder_factory); |
| 49 |
| 50 static MediaEngineInterface* Create( |
| 51 webrtc::AudioDeviceModule* adm, |
| 52 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| 53 audio_decoder_factory, |
| 54 WebRtcVideoEncoderFactory* video_encoder_factory, |
| 55 WebRtcVideoDecoderFactory* video_decoder_factory, |
| 56 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer); |
| 48 }; | 57 }; |
| 49 | 58 |
| 50 // Verify that extension IDs are within 1-byte extension range and are not | 59 // Verify that extension IDs are within 1-byte extension range and are not |
| 51 // overlapping. | 60 // overlapping. |
| 52 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); | 61 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); |
| 53 | 62 |
| 54 // Discard any extensions not validated by the 'supported' predicate. Duplicate | 63 // Discard any extensions not validated by the 'supported' predicate. Duplicate |
| 55 // extensions are removed if 'filter_redundant_extensions' is set, and also any | 64 // extensions are removed if 'filter_redundant_extensions' is set, and also any |
| 56 // mutually exclusive extensions (see implementation for details) are removed. | 65 // mutually exclusive extensions (see implementation for details) are removed. |
| 57 std::vector<webrtc::RtpExtension> FilterRtpExtensions( | 66 std::vector<webrtc::RtpExtension> FilterRtpExtensions( |
| 58 const std::vector<webrtc::RtpExtension>& extensions, | 67 const std::vector<webrtc::RtpExtension>& extensions, |
| 59 bool (*supported)(const std::string&), | 68 bool (*supported)(const std::string&), |
| 60 bool filter_redundant_extensions); | 69 bool filter_redundant_extensions); |
| 61 | 70 |
| 62 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( | 71 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( |
| 63 const Codec& codec); | 72 const Codec& codec); |
| 64 | 73 |
| 65 } // namespace cricket | 74 } // namespace cricket |
| 66 | 75 |
| 67 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ | 76 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ |
| OLD | NEW |