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_impl.h" | 5 #include "content/renderer/media/media_stream_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 p2p_socket_dispatcher_->AddDestructionObserver(this); | 443 p2p_socket_dispatcher_->AddDestructionObserver(this); |
444 } | 444 } |
445 | 445 |
446 if (!socket_factory_.get()) { | 446 if (!socket_factory_.get()) { |
447 socket_factory_.reset( | 447 socket_factory_.reset( |
448 new content::IpcPacketSocketFactory(p2p_socket_dispatcher_)); | 448 new content::IpcPacketSocketFactory(p2p_socket_dispatcher_)); |
449 } | 449 } |
450 | 450 |
451 if (!dependency_factory_->PeerConnectionFactoryCreated()) { | 451 if (!dependency_factory_->PeerConnectionFactoryCreated()) { |
452 if (!dependency_factory_->CreatePeerConnectionFactory( | 452 if (!dependency_factory_->CreatePeerConnectionFactory( |
| 453 render_view(), |
453 worker_thread_, | 454 worker_thread_, |
454 signaling_thread_, | 455 signaling_thread_, |
455 p2p_socket_dispatcher_, | 456 p2p_socket_dispatcher_, |
456 network_manager_, | 457 network_manager_, |
457 socket_factory_.get())) { | 458 socket_factory_.get())) { |
458 LOG(ERROR) << "Could not create PeerConnection factory"; | 459 LOG(ERROR) << "Could not create PeerConnection factory"; |
459 return false; | 460 return false; |
460 } | 461 } |
461 } | 462 } |
462 | 463 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 MediaStreamExtraData::MediaStreamExtraData( | 572 MediaStreamExtraData::MediaStreamExtraData( |
572 webrtc::MediaStreamInterface* remote_stream) | 573 webrtc::MediaStreamInterface* remote_stream) |
573 : remote_stream_(remote_stream) { | 574 : remote_stream_(remote_stream) { |
574 } | 575 } |
575 MediaStreamExtraData::MediaStreamExtraData( | 576 MediaStreamExtraData::MediaStreamExtraData( |
576 webrtc::LocalMediaStreamInterface* local_stream) | 577 webrtc::LocalMediaStreamInterface* local_stream) |
577 : local_stream_(local_stream) { | 578 : local_stream_(local_stream) { |
578 } | 579 } |
579 MediaStreamExtraData::~MediaStreamExtraData() { | 580 MediaStreamExtraData::~MediaStreamExtraData() { |
580 } | 581 } |
OLD | NEW |