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_receiver.h" | 5 #include "content/renderer/media/webrtc/rtc_rtp_receiver.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/renderer/media/webrtc/rtc_rtp_contributing_source.h" | |
8 #include "third_party/webrtc/base/scoped_ref_ptr.h" | 9 #include "third_party/webrtc/base/scoped_ref_ptr.h" |
9 | 10 |
10 namespace content { | 11 namespace content { |
11 | 12 |
12 namespace { | 13 namespace { |
13 | 14 |
14 inline bool operator==(const blink::WebMediaStreamTrack& web_track, | 15 inline bool operator==(const blink::WebMediaStreamTrack& web_track, |
15 const webrtc::MediaStreamTrackInterface& webrtc_track) { | 16 const webrtc::MediaStreamTrackInterface& webrtc_track) { |
16 return !web_track.isNull() && web_track.id() == webrtc_track.id().c_str(); | 17 return !web_track.isNull() && web_track.id() == webrtc_track.id().c_str(); |
17 } | 18 } |
(...skipping 18 matching lines...) Expand all Loading... | |
36 | 37 |
37 uintptr_t RTCRtpReceiver::id() const { | 38 uintptr_t RTCRtpReceiver::id() const { |
38 return getId(webrtc_rtp_receiver_.get()); | 39 return getId(webrtc_rtp_receiver_.get()); |
39 } | 40 } |
40 | 41 |
41 const blink::WebMediaStreamTrack& RTCRtpReceiver::track() const { | 42 const blink::WebMediaStreamTrack& RTCRtpReceiver::track() const { |
42 DCHECK(web_track_ == webrtc_track()); | 43 DCHECK(web_track_ == webrtc_track()); |
43 return web_track_; | 44 return web_track_; |
44 } | 45 } |
45 | 46 |
47 blink::WebVector<std::unique_ptr<blink::WebRTCRtpContributingSource>> | |
48 RTCRtpReceiver::getSources() { | |
49 auto webrtc_sources = webrtc_rtp_receiver_->GetSources(); | |
50 blink::WebVector<std::unique_ptr<blink::WebRTCRtpContributingSource>> sources( | |
51 webrtc_sources.size()); | |
52 for (size_t i = 0; i < webrtc_sources.size(); ++i) { | |
53 sources[i].reset(new RTCRtpContributingSource(webrtc_sources[i])); | |
Guido Urdaneta
2017/04/06 12:54:56
use MakeUnique
hbos_chromium
2017/04/06 14:49:37
Done.
| |
54 } | |
55 return sources; | |
56 } | |
57 | |
46 const webrtc::MediaStreamTrackInterface& RTCRtpReceiver::webrtc_track() const { | 58 const webrtc::MediaStreamTrackInterface& RTCRtpReceiver::webrtc_track() const { |
47 const webrtc::MediaStreamTrackInterface* webrtc_track = | 59 const webrtc::MediaStreamTrackInterface* webrtc_track = |
48 webrtc_rtp_receiver_->track(); | 60 webrtc_rtp_receiver_->track(); |
49 DCHECK(webrtc_track); | 61 DCHECK(webrtc_track); |
50 DCHECK(web_track_ == *webrtc_track); | 62 DCHECK(web_track_ == *webrtc_track); |
51 return *webrtc_track; | 63 return *webrtc_track; |
52 } | 64 } |
53 | 65 |
54 } // namespace content | 66 } // namespace content |
OLD | NEW |