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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 | 503 |
504 bool WebRtcVoiceEngine::ToCodecInst(const AudioCodec& in, | 504 bool WebRtcVoiceEngine::ToCodecInst(const AudioCodec& in, |
505 webrtc::CodecInst* out) { | 505 webrtc::CodecInst* out) { |
506 return WebRtcVoiceCodecs::ToCodecInst(in, out); | 506 return WebRtcVoiceCodecs::ToCodecInst(in, out); |
507 } | 507 } |
508 | 508 |
509 WebRtcVoiceEngine::WebRtcVoiceEngine( | 509 WebRtcVoiceEngine::WebRtcVoiceEngine( |
510 webrtc::AudioDeviceModule* adm, | 510 webrtc::AudioDeviceModule* adm, |
511 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory) | 511 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory) |
512 : WebRtcVoiceEngine(adm, decoder_factory, new VoEWrapper()) { | 512 : WebRtcVoiceEngine(adm, decoder_factory, new VoEWrapper()) { |
513 audio_state_ = webrtc::AudioState::Create(MakeAudioStateConfig(voe())); | 513 audio_state_ = webrtc::AudioState::Create(MakeAudioStateConfig(voe()), adm); |
514 } | 514 } |
515 | 515 |
516 WebRtcVoiceEngine::WebRtcVoiceEngine( | 516 WebRtcVoiceEngine::WebRtcVoiceEngine( |
517 webrtc::AudioDeviceModule* adm, | 517 webrtc::AudioDeviceModule* adm, |
518 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory, | 518 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory, |
519 VoEWrapper* voe_wrapper) | 519 VoEWrapper* voe_wrapper) |
520 : adm_(adm), decoder_factory_(decoder_factory), voe_wrapper_(voe_wrapper) { | 520 : adm_(adm), decoder_factory_(decoder_factory), voe_wrapper_(voe_wrapper) { |
521 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 521 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
522 LOG(LS_INFO) << "WebRtcVoiceEngine::WebRtcVoiceEngine"; | 522 LOG(LS_INFO) << "WebRtcVoiceEngine::WebRtcVoiceEngine"; |
523 RTC_DCHECK(voe_wrapper); | 523 RTC_DCHECK(voe_wrapper); |
(...skipping 2137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2661 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 2661 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
2662 const auto it = send_streams_.find(ssrc); | 2662 const auto it = send_streams_.find(ssrc); |
2663 if (it != send_streams_.end()) { | 2663 if (it != send_streams_.end()) { |
2664 return it->second->channel(); | 2664 return it->second->channel(); |
2665 } | 2665 } |
2666 return -1; | 2666 return -1; |
2667 } | 2667 } |
2668 } // namespace cricket | 2668 } // namespace cricket |
2669 | 2669 |
2670 #endif // HAVE_WEBRTC_VOICE | 2670 #endif // HAVE_WEBRTC_VOICE |
OLD | NEW |