Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Side by Side Diff: content/renderer/media/webrtc/rtc_rtp_receiver.cc

Issue 2813443003: Revert of RTCRtpReceiver.getContributingSources() added. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/memory/ptr_util.h"
9 #include "content/renderer/media/webrtc/rtc_rtp_contributing_source.h"
10 #include "third_party/webrtc/base/scoped_ref_ptr.h" 8 #include "third_party/webrtc/base/scoped_ref_ptr.h"
11 9
12 namespace content { 10 namespace content {
13 11
14 namespace { 12 namespace {
15 13
16 inline bool operator==(const blink::WebMediaStreamTrack& web_track, 14 inline bool operator==(const blink::WebMediaStreamTrack& web_track,
17 const webrtc::MediaStreamTrackInterface& webrtc_track) { 15 const webrtc::MediaStreamTrackInterface& webrtc_track) {
18 return !web_track.IsNull() && web_track.Id() == webrtc_track.id().c_str(); 16 return !web_track.IsNull() && web_track.Id() == webrtc_track.id().c_str();
19 } 17 }
(...skipping 18 matching lines...) Expand all
38 36
39 uintptr_t RTCRtpReceiver::Id() const { 37 uintptr_t RTCRtpReceiver::Id() const {
40 return getId(webrtc_rtp_receiver_.get()); 38 return getId(webrtc_rtp_receiver_.get());
41 } 39 }
42 40
43 const blink::WebMediaStreamTrack& RTCRtpReceiver::Track() const { 41 const blink::WebMediaStreamTrack& RTCRtpReceiver::Track() const {
44 DCHECK(web_track_ == webrtc_track()); 42 DCHECK(web_track_ == webrtc_track());
45 return web_track_; 43 return web_track_;
46 } 44 }
47 45
48 blink::WebVector<std::unique_ptr<blink::WebRTCRtpContributingSource>>
49 RTCRtpReceiver::GetSources() {
50 auto webrtc_sources = webrtc_rtp_receiver_->GetSources();
51 blink::WebVector<std::unique_ptr<blink::WebRTCRtpContributingSource>> sources(
52 webrtc_sources.size());
53 for (size_t i = 0; i < webrtc_sources.size(); ++i) {
54 sources[i] = base::MakeUnique<RTCRtpContributingSource>(webrtc_sources[i]);
55 }
56 return sources;
57 }
58
59 const webrtc::MediaStreamTrackInterface& RTCRtpReceiver::webrtc_track() const { 46 const webrtc::MediaStreamTrackInterface& RTCRtpReceiver::webrtc_track() const {
60 const webrtc::MediaStreamTrackInterface* webrtc_track = 47 const webrtc::MediaStreamTrackInterface* webrtc_track =
61 webrtc_rtp_receiver_->track(); 48 webrtc_rtp_receiver_->track();
62 DCHECK(webrtc_track); 49 DCHECK(webrtc_track);
63 DCHECK(web_track_ == *webrtc_track); 50 DCHECK(web_track_ == *webrtc_track);
64 return *webrtc_track; 51 return *webrtc_track;
65 } 52 }
66 53
67 } // namespace content 54 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/rtc_rtp_receiver.h ('k') | content/shell/test_runner/mock_webrtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698