OLD | NEW |
---|---|
1 // Copyright (c) 2017 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2017 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/webrtc/rtc_rtp_sender.h" | 5 #include "content/renderer/media/webrtc/rtc_rtp_sender.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "third_party/webrtc/rtc_base/scoped_ref_ptr.h" | 8 #include "third_party/webrtc/rtc_base/scoped_ref_ptr.h" |
9 | 9 |
10 namespace content { | 10 namespace content { |
11 | 11 |
12 namespace { | 12 namespace { |
13 | 13 |
14 inline bool operator==( | 14 inline bool operator==( |
15 const std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef>& | 15 const std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef>& |
16 track_adapter, | 16 track_adapter, |
17 const webrtc::MediaStreamTrackInterface* webrtc_track) { | 17 const webrtc::MediaStreamTrackInterface* webrtc_track) { |
18 if (!track_adapter) | 18 if (!track_adapter) { |
19 return !webrtc_track; | 19 // TODO(hbos): See TODO in |OnRemoved|. Because we can't set a stopped |
20 // sender's track to null any |webrtc_track| could be correct. When this is | |
21 // fixed this line should be: return !webrtc_track; | |
22 return true; | |
23 } | |
20 return track_adapter->webrtc_track() == webrtc_track; | 24 return track_adapter->webrtc_track() == webrtc_track; |
21 } | 25 } |
22 | 26 |
23 } // namespace | 27 } // namespace |
24 | 28 |
25 uintptr_t RTCRtpSender::getId( | 29 uintptr_t RTCRtpSender::getId( |
26 const webrtc::RtpSenderInterface* webrtc_rtp_sender) { | 30 const webrtc::RtpSenderInterface* webrtc_rtp_sender) { |
27 return reinterpret_cast<uintptr_t>(webrtc_rtp_sender); | 31 return reinterpret_cast<uintptr_t>(webrtc_rtp_sender); |
28 } | 32 } |
29 | 33 |
30 RTCRtpSender::RTCRtpSender( | 34 RTCRtpSender::RTCRtpSender( |
31 scoped_refptr<webrtc::RtpSenderInterface> webrtc_rtp_sender, | 35 scoped_refptr<webrtc::RtpSenderInterface> webrtc_rtp_sender, |
32 std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef> track_adapter) | 36 std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef> track_adapter) |
37 : RTCRtpSender( | |
38 std::move(webrtc_rtp_sender), | |
39 std::move(track_adapter), | |
40 std::vector< | |
41 std::unique_ptr<WebRtcMediaStreamAdapterMap::AdapterRef>>()) {} | |
42 | |
43 RTCRtpSender::RTCRtpSender( | |
44 scoped_refptr<webrtc::RtpSenderInterface> webrtc_rtp_sender, | |
45 std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef> track_adapter, | |
46 std::vector<std::unique_ptr<WebRtcMediaStreamAdapterMap::AdapterRef>> | |
47 stream_adapters) | |
33 : webrtc_rtp_sender_(std::move(webrtc_rtp_sender)), | 48 : webrtc_rtp_sender_(std::move(webrtc_rtp_sender)), |
34 track_adapter_(std::move(track_adapter)) { | 49 track_adapter_(std::move(track_adapter)), |
50 stream_adapters_(std::move(stream_adapters)) { | |
35 DCHECK(webrtc_rtp_sender_); | 51 DCHECK(webrtc_rtp_sender_); |
36 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); | 52 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); |
37 } | 53 } |
38 | 54 |
39 RTCRtpSender::~RTCRtpSender() {} | 55 RTCRtpSender::~RTCRtpSender() {} |
40 | 56 |
41 uintptr_t RTCRtpSender::Id() const { | 57 uintptr_t RTCRtpSender::Id() const { |
42 return getId(webrtc_rtp_sender_.get()); | 58 return getId(webrtc_rtp_sender_.get()); |
43 } | 59 } |
44 | 60 |
45 const blink::WebMediaStreamTrack* RTCRtpSender::Track() const { | 61 const blink::WebMediaStreamTrack* RTCRtpSender::Track() const { |
46 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); | 62 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); |
47 return track_adapter_ ? &track_adapter_->web_track() : nullptr; | 63 return track_adapter_ ? &track_adapter_->web_track() : nullptr; |
48 } | 64 } |
49 | 65 |
66 void RTCRtpSender::OnRemoved() { | |
67 // TODO(hbos): We should do |webrtc_rtp_sender_->SetTrack(null)| but that is | |
68 // not allowed on a stopped sender. | |
Guido Urdaneta
2017/07/05 15:37:06
Include a webrtc bug reference.
hbos_chromium
2017/07/06 12:31:37
Done.
| |
69 track_adapter_.reset(); | |
70 } | |
71 | |
72 webrtc::RtpSenderInterface* RTCRtpSender::webrtc_rtp_sender() { | |
73 return webrtc_rtp_sender_.get(); | |
74 } | |
75 | |
50 const webrtc::MediaStreamTrackInterface* RTCRtpSender::webrtc_track() const { | 76 const webrtc::MediaStreamTrackInterface* RTCRtpSender::webrtc_track() const { |
51 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); | 77 DCHECK(track_adapter_ == webrtc_rtp_sender_->track()); |
52 return track_adapter_ ? track_adapter_->webrtc_track() : nullptr; | 78 return track_adapter_ ? track_adapter_->webrtc_track() : nullptr; |
53 } | 79 } |
54 | 80 |
55 } // namespace content | 81 } // namespace content |
OLD | NEW |