Interface RTCRtpReceiver and RTCPeerConnection.getReceivers() added.

content/renderer/media/rtc_peer_connection_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 
 #include <string.h>
 
 #include <string>
 #include <utility>
@@ skipping 11 matching lines @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/media_stream_track.h"
 #include "content/renderer/media/peer_connection_tracker.h"
 #include "content/renderer/media/remote_media_stream_impl.h"
 #include "content/renderer/media/rtc_certificate.h"
 #include "content/renderer/media/rtc_data_channel_handler.h"
 #include "content/renderer/media/rtc_dtmf_sender_handler.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
+#include "content/renderer/media/webrtc/rtc_rtp_receiver.h"
 #include "content/renderer/media/webrtc/rtc_stats.h"
 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/media_switches.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebRTCAnswerOptions.h"
 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h"
 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h"
@@ skipping 1585 matching lines @@
 
 void RTCPeerConnectionHandler::getStats(
     std::unique_ptr<blink::WebRTCStatsReportCallback> callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   signaling_thread()->PostTask(FROM_HERE,
       base::Bind(&GetRTCStatsOnSignalingThread,
           base::ThreadTaskRunnerHandle::Get(), native_peer_connection_,
           base::Passed(&callback)));
 }
 
+blink::WebVector<std::unique_ptr<blink::WebRTCRtpReceiver>>
+RTCPeerConnectionHandler::getReceivers() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::getReceivers");
+
+  std::vector<rtc::scoped_refptr<webrtc::RtpReceiverInterface>>
+      webrtc_receivers = native_peer_connection_->GetReceivers();
+  std::vector<std::unique_ptr<blink::WebRTCRtpReceiver>> web_receivers;
+  for (size_t i = 0; i < webrtc_receivers.size(); ++i) {
+    rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track =
+        webrtc_receivers[i]->track();
+    DCHECK(webrtc_track);
+    // Create a reference to the receiver. Multiple |RTCRtpReceiver|s can
+    // reference the same webrtc track, see |id|.
+    blink::WebMediaStreamTrack web_track;
+    if (webrtc_track->kind() == webrtc::MediaStreamTrackInterface::kAudioKind) {
+      web_track = GetRemoteAudioTrack(webrtc_track->id());
+    } else {
+      web_track = GetRemoteVideoTrack(webrtc_track->id());
+    }
+    // TODO(hbos): Any existing remote track should be known but the case of a
+    // track being added or removed separately from streams is not handled
+    // properly, see todo in |GetRemoteAudioTrack| and |GetRemoteVideoTrack|.
+    // When that is addressed, DCHECK that the track is not null.

[Guido Urdaneta, 2017/03/27 17:12:23]

reference crbug

[hbos_chromium, 2017/03/28 10:12:55]

Done.

+    if (!web_track.isNull()) {
+      web_receivers.push_back(std::unique_ptr<blink::WebRTCRtpReceiver>(

[Guido Urdaneta, 2017/03/27 17:12:23]

use emplace_back or base::MakeUnique instead of unique_ptr<>(new...)

[hbos_chromium, 2017/03/28 10:12:55]

Done.

[Guido Urdaneta, 2017/03/28 14:27:03]

Nit: I know I suggested emplace_back, but I overlooked that you were storing
pointers. 
Now I think MakeUnique with push_back aligns better with the style guide.
I believe the recommendation nowadays is to avoid new and delete in new code if
you can.

[hbos_chromium, 2017/03/29 14:36:42]

Done.

+          new RTCRtpReceiver(webrtc_receivers[i].get(), web_track)));
+    }
+  }
+
+  // |blink::WebVector|'s size must be known at construction, that is why
+  // |web_vectors| uses |std::vector| and needs to be moved before returning.
+  blink::WebVector<std::unique_ptr<blink::WebRTCRtpReceiver>> result(
+      web_receivers.size());
+  for (size_t i = 0; i < web_receivers.size(); ++i) {
+    result[i] = std::move(web_receivers[i]);
+  }
+  return result;
+}
+
 void RTCPeerConnectionHandler::CloseClientPeerConnection() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!is_closed_)
     client_->closePeerConnection();
 }
 
 void RTCPeerConnectionHandler::StartEventLog(IPC::PlatformFileForTransit file,
                                              int64_t max_file_size_bytes) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(file != IPC::InvalidPlatformFileForTransit());
@@ skipping 340 matching lines @@
     base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                               base::WaitableEvent::InitialState::NOT_SIGNALED);
     thread->PostTask(FROM_HERE,
         base::Bind(&RunSynchronousClosure, closure,
                    base::Unretained(trace_event_name),
                    base::Unretained(&event)));
     event.Wait();
   }
 }
 
+blink::WebMediaStreamTrack RTCPeerConnectionHandler::GetRemoteAudioTrack(
+    const std::string& track_id) const {

[Guido Urdaneta, 2017/03/27 17:12:23]

Since both methods are the same except for getAudioTrack/getVideoTrack, maybe
you can have a third method that does the logic and receives a pointer to the
method to use.

[hbos_chromium, 2017/03/28 10:12:54]

Done.

+  // TODO(hbos): Tracks and streams are currently added/removed on a per-stream
+  // basis, but tracks could be removed from a stream or added to an existing
+  // stream. We need to listen to events of tracks being added and removed, and
+  // have a list of tracks that is separate from the list of streams.
+  DCHECK(thread_checker_.CalledOnValidThread());
+  blink::WebString id = blink::WebString::fromUTF8(track_id);
+  for (const auto& remote_stream_pair : remote_streams_) {
+    blink::WebMediaStreamTrack web_track =
+        remote_stream_pair.second->webkit_stream().getAudioTrack(id);
+    if (!web_track.isNull())
+      return web_track;
+  }
+  return blink::WebMediaStreamTrack();
+}
+
+blink::WebMediaStreamTrack RTCPeerConnectionHandler::GetRemoteVideoTrack(
+    const std::string& track_id) const {
+  // TODO(hbos): Tracks and streams are currently added/removed on a per-stream
+  // basis, but tracks could be removed from a stream or added to an existing
+  // stream. We need to listen to events of tracks being added and removed, and
+  // have a list of tracks that is separate from the list of streams.
+  DCHECK(thread_checker_.CalledOnValidThread());
+  blink::WebString id = blink::WebString::fromUTF8(track_id);
+  for (const auto& remote_stream_pair : remote_streams_) {
+    blink::WebMediaStreamTrack web_track =
+        remote_stream_pair.second->webkit_stream().getVideoTrack(id);
+    if (!web_track.isNull())
+      return web_track;
+  }
+  return blink::WebMediaStreamTrack();
+}
+
 void RTCPeerConnectionHandler::ReportICEState(
     webrtc::PeerConnectionInterface::IceConnectionState new_state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (ice_state_seen_[new_state])
     return;
   ice_state_seen_[new_state] = true;
   UMA_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.ConnectionState", new_state,
                             webrtc::PeerConnectionInterface::kIceConnectionMax);
 }
 
 void RTCPeerConnectionHandler::ResetUMAStats() {
   DCHECK(thread_checker_.CalledOnValidThread());
   num_local_candidates_ipv6_ = 0;
   num_local_candidates_ipv4_ = 0;
   ice_connection_checking_start_ = base::TimeTicks();
   memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
 }
 }  // namespace content