| 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 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 class WebRtcMediaEngineFactory { | 33 class WebRtcMediaEngineFactory { |
| 34 public: | 34 public: |
| 35 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the | 35 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the |
| 36 // audio decoder factory is fully plumbed and used throughout WebRTC. | 36 // audio decoder factory is fully plumbed and used throughout WebRTC. |
| 37 // See: crbug.com/webrtc/6000 | 37 // See: crbug.com/webrtc/6000 |
| 38 static MediaEngineInterface* Create( | 38 static MediaEngineInterface* Create( |
| 39 webrtc::AudioDeviceModule* adm, | 39 webrtc::AudioDeviceModule* adm, |
| 40 WebRtcVideoEncoderFactory* video_encoder_factory, | 40 WebRtcVideoEncoderFactory* video_encoder_factory, |
| 41 WebRtcVideoDecoderFactory* video_decoder_factory); | 41 WebRtcVideoDecoderFactory* video_decoder_factory); |
| 42 | 42 |
| 43 // TODO(deadbeef): Change these to return an std::unique_ptr<>, to indicate |
| 44 // that the caller owns the returned object. |
| 43 static MediaEngineInterface* Create( | 45 static MediaEngineInterface* Create( |
| 44 webrtc::AudioDeviceModule* adm, | 46 webrtc::AudioDeviceModule* adm, |
| 45 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& | 47 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| 46 audio_decoder_factory, | 48 audio_decoder_factory, |
| 47 WebRtcVideoEncoderFactory* video_encoder_factory, | 49 WebRtcVideoEncoderFactory* video_encoder_factory, |
| 48 WebRtcVideoDecoderFactory* video_decoder_factory); | 50 WebRtcVideoDecoderFactory* video_decoder_factory); |
| 49 | 51 |
| 50 static MediaEngineInterface* Create( | 52 static MediaEngineInterface* Create( |
| 51 webrtc::AudioDeviceModule* adm, | 53 webrtc::AudioDeviceModule* adm, |
| 52 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& | 54 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| (...skipping 14 matching lines...) Expand all Loading... |
| 67 const std::vector<webrtc::RtpExtension>& extensions, | 69 const std::vector<webrtc::RtpExtension>& extensions, |
| 68 bool (*supported)(const std::string&), | 70 bool (*supported)(const std::string&), |
| 69 bool filter_redundant_extensions); | 71 bool filter_redundant_extensions); |
| 70 | 72 |
| 71 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( | 73 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( |
| 72 const Codec& codec); | 74 const Codec& codec); |
| 73 | 75 |
| 74 } // namespace cricket | 76 } // namespace cricket |
| 75 | 77 |
| 76 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ | 78 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ |
| OLD | NEW |