| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/media_stream_dependency_factory.h" | 5 #include "content/renderer/media/media_stream_dependency_factory.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 return webrtc::CreateSessionDescription(type, sdp); | 404 return webrtc::CreateSessionDescription(type, sdp); |
| 405 } | 405 } |
| 406 | 406 |
| 407 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( | 407 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( |
| 408 const std::string& sdp_mid, | 408 const std::string& sdp_mid, |
| 409 int sdp_mline_index, | 409 int sdp_mline_index, |
| 410 const std::string& sdp) { | 410 const std::string& sdp) { |
| 411 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp); | 411 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp); |
| 412 } | 412 } |
| 413 | 413 |
| 414 WebRtcAudioDeviceImpl* |
| 415 MediaStreamDependencyFactory::GetWebRtcAudioDevice() { |
| 416 return audio_device_; |
| 417 } |
| 418 |
| 414 void MediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) { | 419 void MediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) { |
| 415 audio_device_->SetSessionId(session_id); | 420 audio_device_->SetSessionId(session_id); |
| 416 } | 421 } |
| 417 | 422 |
| 418 void MediaStreamDependencyFactory::InitializeWorkerThread( | 423 void MediaStreamDependencyFactory::InitializeWorkerThread( |
| 419 talk_base::Thread** thread, | 424 talk_base::Thread** thread, |
| 420 base::WaitableEvent* event) { | 425 base::WaitableEvent* event) { |
| 421 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); | 426 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); |
| 422 jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); | 427 jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); |
| 423 *thread = jingle_glue::JingleThreadWrapper::current(); | 428 *thread = jingle_glue::JingleThreadWrapper::current(); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 // processed before returning. We wait for the above task to finish before | 511 // processed before returning. We wait for the above task to finish before |
| 507 // letting the the function continue to avoid any potential race issues. | 512 // letting the the function continue to avoid any potential race issues. |
| 508 chrome_worker_thread_.Stop(); | 513 chrome_worker_thread_.Stop(); |
| 509 } else { | 514 } else { |
| 510 NOTREACHED() << "Worker thread not running."; | 515 NOTREACHED() << "Worker thread not running."; |
| 511 } | 516 } |
| 512 } | 517 } |
| 513 } | 518 } |
| 514 | 519 |
| 515 } // namespace content | 520 } // namespace content |
| OLD | NEW |