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/rtc_peer_connection_handler.h" | 5 #include "content/renderer/media/rtc_peer_connection_handler.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1510 } | 1510 } |
1511 | 1511 |
1512 return webkit_request.requestSucceeded(); | 1512 return webkit_request.requestSucceeded(); |
1513 } | 1513 } |
1514 | 1514 |
1515 bool RTCPeerConnectionHandler::addStream( | 1515 bool RTCPeerConnectionHandler::addStream( |
1516 const blink::WebMediaStream& stream, | 1516 const blink::WebMediaStream& stream, |
1517 const blink::WebMediaConstraints& options) { | 1517 const blink::WebMediaConstraints& options) { |
1518 DCHECK(thread_checker_.CalledOnValidThread()); | 1518 DCHECK(thread_checker_.CalledOnValidThread()); |
1519 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addStream"); | 1519 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addStream"); |
1520 for (ScopedVector<WebRtcMediaStreamAdapter>::iterator adapter_it = | 1520 for (const auto& adapter : local_streams_) { |
1521 local_streams_.begin(); adapter_it != local_streams_.end(); | 1521 if (adapter->IsEqual(stream)) { |
1522 ++adapter_it) { | |
1523 if ((*adapter_it)->IsEqual(stream)) { | |
1524 DVLOG(1) << "RTCPeerConnectionHandler::addStream called with the same " | 1522 DVLOG(1) << "RTCPeerConnectionHandler::addStream called with the same " |
1525 << "stream twice. id=" << stream.id().utf8(); | 1523 << "stream twice. id=" << stream.id().utf8(); |
1526 return false; | 1524 return false; |
1527 } | 1525 } |
1528 } | 1526 } |
1529 | 1527 |
1530 if (peer_connection_tracker_) { | 1528 if (peer_connection_tracker_) { |
1531 peer_connection_tracker_->TrackAddStream( | 1529 peer_connection_tracker_->TrackAddStream( |
1532 this, stream, PeerConnectionTracker::SOURCE_LOCAL); | 1530 this, stream, PeerConnectionTracker::SOURCE_LOCAL); |
1533 } | 1531 } |
1534 | 1532 |
1535 PerSessionWebRTCAPIMetrics::GetInstance()->IncrementStreamCounter(); | 1533 PerSessionWebRTCAPIMetrics::GetInstance()->IncrementStreamCounter(); |
1536 | 1534 |
1537 WebRtcMediaStreamAdapter* adapter = | 1535 local_streams_.push_back( |
1538 new WebRtcMediaStreamAdapter(stream, dependency_factory_); | 1536 base::MakeUnique<WebRtcMediaStreamAdapter>(stream, dependency_factory_)); |
1539 local_streams_.push_back(adapter); | |
1540 | 1537 |
1541 webrtc::MediaStreamInterface* webrtc_stream = adapter->webrtc_media_stream(); | 1538 webrtc::MediaStreamInterface* webrtc_stream = |
| 1539 local_streams_.back()->webrtc_media_stream(); |
1542 track_metrics_.AddStream(MediaStreamTrackMetrics::SENT_STREAM, | 1540 track_metrics_.AddStream(MediaStreamTrackMetrics::SENT_STREAM, |
1543 webrtc_stream); | 1541 webrtc_stream); |
1544 | 1542 |
1545 if (!options.isEmpty()) { | 1543 if (!options.isEmpty()) { |
1546 // TODO(perkj): |mediaConstraints| is the name of the optional constraints | 1544 // TODO(perkj): |mediaConstraints| is the name of the optional constraints |
1547 // argument in RTCPeerConnection.idl. It has been removed from the spec and | 1545 // argument in RTCPeerConnection.idl. It has been removed from the spec and |
1548 // should be removed from blink as well. | 1546 // should be removed from blink as well. |
1549 LOG(WARNING) | 1547 LOG(WARNING) |
1550 << "mediaConstraints is not a supported argument to addStream."; | 1548 << "mediaConstraints is not a supported argument to addStream."; |
1551 LOG(WARNING) << "mediaConstraints was " << options.toString().utf8(); | 1549 LOG(WARNING) << "mediaConstraints was " << options.toString().utf8(); |
1552 } | 1550 } |
1553 | 1551 |
1554 return native_peer_connection_->AddStream(webrtc_stream); | 1552 return native_peer_connection_->AddStream(webrtc_stream); |
1555 } | 1553 } |
1556 | 1554 |
1557 void RTCPeerConnectionHandler::removeStream( | 1555 void RTCPeerConnectionHandler::removeStream( |
1558 const blink::WebMediaStream& stream) { | 1556 const blink::WebMediaStream& stream) { |
1559 DCHECK(thread_checker_.CalledOnValidThread()); | 1557 DCHECK(thread_checker_.CalledOnValidThread()); |
1560 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::removeStream"); | 1558 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::removeStream"); |
1561 // Find the webrtc stream. | 1559 // Find the webrtc stream. |
1562 scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream; | 1560 scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream; |
1563 for (ScopedVector<WebRtcMediaStreamAdapter>::iterator adapter_it = | 1561 for (auto adapter_it = local_streams_.begin(); |
1564 local_streams_.begin(); adapter_it != local_streams_.end(); | 1562 adapter_it != local_streams_.end(); ++adapter_it) { |
1565 ++adapter_it) { | |
1566 if ((*adapter_it)->IsEqual(stream)) { | 1563 if ((*adapter_it)->IsEqual(stream)) { |
1567 webrtc_stream = (*adapter_it)->webrtc_media_stream(); | 1564 webrtc_stream = (*adapter_it)->webrtc_media_stream(); |
1568 local_streams_.erase(adapter_it); | 1565 local_streams_.erase(adapter_it); |
1569 break; | 1566 break; |
1570 } | 1567 } |
1571 } | 1568 } |
1572 DCHECK(webrtc_stream.get()); | 1569 DCHECK(webrtc_stream.get()); |
1573 // TODO(tommi): Make this async (PostTaskAndReply). | 1570 // TODO(tommi): Make this async (PostTaskAndReply). |
1574 native_peer_connection_->RemoveStream(webrtc_stream.get()); | 1571 native_peer_connection_->RemoveStream(webrtc_stream.get()); |
1575 | 1572 |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1690 | 1687 |
1691 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( | 1688 blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( |
1692 const blink::WebMediaStreamTrack& track) { | 1689 const blink::WebMediaStreamTrack& track) { |
1693 DCHECK(thread_checker_.CalledOnValidThread()); | 1690 DCHECK(thread_checker_.CalledOnValidThread()); |
1694 DCHECK(!track.isNull()); | 1691 DCHECK(!track.isNull()); |
1695 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); | 1692 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDTMFSender"); |
1696 DVLOG(1) << "createDTMFSender."; | 1693 DVLOG(1) << "createDTMFSender."; |
1697 | 1694 |
1698 // Find the WebRtc track referenced by the blink track's ID. | 1695 // Find the WebRtc track referenced by the blink track's ID. |
1699 webrtc::AudioTrackInterface* webrtc_track = nullptr; | 1696 webrtc::AudioTrackInterface* webrtc_track = nullptr; |
1700 for (const WebRtcMediaStreamAdapter* s : local_streams_) { | 1697 for (const auto& adapter : local_streams_) { |
1701 webrtc_track = s->webrtc_media_stream()->FindAudioTrack(track.id().utf8()); | 1698 webrtc_track = |
| 1699 adapter->webrtc_media_stream()->FindAudioTrack(track.id().utf8()); |
1702 if (webrtc_track) | 1700 if (webrtc_track) |
1703 break; | 1701 break; |
1704 } | 1702 } |
1705 if (!webrtc_track) { | 1703 if (!webrtc_track) { |
1706 DLOG(ERROR) << "Audio track with ID '" << track.id().utf8() | 1704 DLOG(ERROR) << "Audio track with ID '" << track.id().utf8() |
1707 << "' has no known WebRtc sink."; | 1705 << "' has no known WebRtc sink."; |
1708 return nullptr; | 1706 return nullptr; |
1709 } | 1707 } |
1710 | 1708 |
1711 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( | 1709 rtc::scoped_refptr<webrtc::DtmfSenderInterface> sender( |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2005 } | 2003 } |
2006 | 2004 |
2007 void RTCPeerConnectionHandler::ResetUMAStats() { | 2005 void RTCPeerConnectionHandler::ResetUMAStats() { |
2008 DCHECK(thread_checker_.CalledOnValidThread()); | 2006 DCHECK(thread_checker_.CalledOnValidThread()); |
2009 num_local_candidates_ipv6_ = 0; | 2007 num_local_candidates_ipv6_ = 0; |
2010 num_local_candidates_ipv4_ = 0; | 2008 num_local_candidates_ipv4_ = 0; |
2011 ice_connection_checking_start_ = base::TimeTicks(); | 2009 ice_connection_checking_start_ = base::TimeTicks(); |
2012 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); | 2010 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); |
2013 } | 2011 } |
2014 } // namespace content | 2012 } // namespace content |
OLD | NEW |