| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 CompositeMediaEngine(webrtc::AudioDeviceModule* adm, | 115 CompositeMediaEngine(webrtc::AudioDeviceModule* adm, |
| 116 const rtc::scoped_refptr<webrtc::AudioEncoderFactory>& | 116 const rtc::scoped_refptr<webrtc::AudioEncoderFactory>& |
| 117 audio_encoder_factory, | 117 audio_encoder_factory, |
| 118 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& | 118 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& |
| 119 audio_decoder_factory, | 119 audio_decoder_factory, |
| 120 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) | 120 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) |
| 121 : voice_(adm, audio_encoder_factory, audio_decoder_factory, audio_mixer) { | 121 : voice_(adm, audio_encoder_factory, audio_decoder_factory, audio_mixer) { |
| 122 } | 122 } |
| 123 virtual ~CompositeMediaEngine() {} | 123 virtual ~CompositeMediaEngine() {} |
| 124 virtual bool Init() { | 124 virtual bool Init() { |
| 125 voice_.Init(); |
| 125 video_.Init(); | 126 video_.Init(); |
| 126 return true; | 127 return true; |
| 127 } | 128 } |
| 128 | 129 |
| 129 virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const { | 130 virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const { |
| 130 return voice_.GetAudioState(); | 131 return voice_.GetAudioState(); |
| 131 } | 132 } |
| 132 virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call, | 133 virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call, |
| 133 const MediaConfig& config, | 134 const MediaConfig& config, |
| 134 const AudioOptions& options) { | 135 const AudioOptions& options) { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 virtual ~DataEngineInterface() {} | 178 virtual ~DataEngineInterface() {} |
| 178 virtual DataMediaChannel* CreateChannel(const MediaConfig& config) = 0; | 179 virtual DataMediaChannel* CreateChannel(const MediaConfig& config) = 0; |
| 179 virtual const std::vector<DataCodec>& data_codecs() = 0; | 180 virtual const std::vector<DataCodec>& data_codecs() = 0; |
| 180 }; | 181 }; |
| 181 | 182 |
| 182 webrtc::RtpParameters CreateRtpParametersWithOneEncoding(); | 183 webrtc::RtpParameters CreateRtpParametersWithOneEncoding(); |
| 183 | 184 |
| 184 } // namespace cricket | 185 } // namespace cricket |
| 185 | 186 |
| 186 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ | 187 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ |
| OLD | NEW |