RTCInboundRTPStreamStats added.

webrtc/api/rtcstatscollector.cc

Index: webrtc/api/rtcstatscollector.cc
diff --git a/webrtc/api/rtcstatscollector.cc b/webrtc/api/rtcstatscollector.cc
index 45c3c403aedacaa5799f4f221210cccebe099ffb..8d7c1790afb9b3dee1ef4368dee3b089e28764b9 100644
--- a/webrtc/api/rtcstatscollector.cc
+++ b/webrtc/api/rtcstatscollector.cc
@@ -53,6 +53,11 @@ std::string RTCTransportStatsIDFromBaseChannel(
       proxy_it->second, cricket::ICE_CANDIDATE_COMPONENT_RTP);
 }
 
+std::string RTCInboundRTPStreamStatsIDFromSSRC(bool audio, uint32_t ssrc) {
+  return audio ? "RTCInboundRTPAudioStream_" + rtc::ToString<>(ssrc)
+               : "RTCInboundRTPVideoStream_" + rtc::ToString<>(ssrc);
+}
+
 std::string RTCOutboundRTPStreamStatsIDFromSSRC(bool audio, uint32_t ssrc) {
   return audio ? "RTCOutboundRTPAudioStream_" + rtc::ToString<>(ssrc)
                : "RTCOutboundRTPVideoStream_" + rtc::ToString<>(ssrc);
@@ -88,6 +93,45 @@ const char* DataStateToRTCDataChannelState(
   }
 }
 
+void SetInboundRTPStreamStatsFromMediaReceiverInfo(
+    const cricket::MediaReceiverInfo& media_receiver_info,
+    RTCInboundRTPStreamStats* inbound_stats) {
+  RTC_DCHECK(inbound_stats);
+  inbound_stats->ssrc = rtc::ToString<>(media_receiver_info.ssrc());
+  // TODO(hbos): Support the remote case. crbug.com/657855
+  inbound_stats->is_remote = false;
+  // TODO(hbos): Set |codec_id| when we have |RTCCodecStats|. Maybe relevant:
+  // |media_receiver_info.codec_name|. crbug.com/657854, 657855, 659117
+  inbound_stats->packets_received =
+      static_cast<uint32_t>(media_receiver_info.packets_rcvd);
+  inbound_stats->bytes_received =
+      static_cast<uint64_t>(media_receiver_info.bytes_rcvd);
+  inbound_stats->fraction_lost =
+      static_cast<double>(media_receiver_info.fraction_lost);
+}
+
+void SetInboundRTPStreamStatsFromVoiceReceiverInfo(
+    const cricket::VoiceReceiverInfo& voice_receiver_info,
+    RTCInboundRTPStreamStats* inbound_stats) {
+  SetInboundRTPStreamStatsFromMediaReceiverInfo(
+      voice_receiver_info, inbound_stats);
+  inbound_stats->media_type = "audio";
+  inbound_stats->jitter =
+      static_cast<double>(voice_receiver_info.jitter_buffer_ms) /

[Taylor Brandstetter, 2016/10/27 21:26:03]

I don't think this is right; it looks like jitter_buffer_ms is the delay used by
the jitter buffer, rather than the raw jitter. I think we want "jitter_ms". Same
below.

[hbos, 2016/10/28 10:03:48]

Done. The audio case has jitter_ms, jitter_buffer_ms and
jitter_buffer_preferred_ms but the video case only has jitter_buffer_ms (with
comment "Jitter (network-related) latency").
I updated to use jitter_ms in the audio case and skipped the stat for the video
case.

+      rtc::kNumMillisecsPerSec;
+}
+
+void SetInboundRTPStreamStatsFromVideoReceiverInfo(
+    const cricket::VideoReceiverInfo& video_receiver_info,
+    RTCInboundRTPStreamStats* inbound_stats) {
+  SetInboundRTPStreamStatsFromMediaReceiverInfo(
+      video_receiver_info, inbound_stats);
+  inbound_stats->media_type = "video";
+  inbound_stats->jitter =
+      static_cast<double>(video_receiver_info.jitter_buffer_ms) /
+      rtc::kNumMillisecsPerSec;
+}
+
 void SetOutboundRTPStreamStatsFromMediaSenderInfo(
     const cricket::MediaSenderInfo& media_sender_info,
     RTCOutboundRTPStreamStats* outbound_stats) {
@@ -464,6 +508,25 @@ void RTCStatsCollector::ProduceRTPStreamStats_s(
     if (pc_->session()->voice_channel()->GetStats(&voice_media_info)) {
       std::string transport_id = RTCTransportStatsIDFromBaseChannel(
           session_stats.proxy_to_transport, *pc_->session()->voice_channel());
+      // Inbound
+      for (const cricket::VoiceReceiverInfo& voice_receiver_info :
+           voice_media_info.receivers) {
+        // TODO(nisse): SSRC == 0 currently means none. Delete check when that
+        // is fixed.
+        if (voice_receiver_info.ssrc() == 0)
+          continue;
+        std::unique_ptr<RTCInboundRTPStreamStats> inbound_audio(
+            new RTCInboundRTPStreamStats(
+                RTCInboundRTPStreamStatsIDFromSSRC(
+                    true, voice_receiver_info.ssrc()),
+                timestamp_us));
+        SetInboundRTPStreamStatsFromVoiceReceiverInfo(
+            voice_receiver_info, inbound_audio.get());
+        if (!transport_id.empty())

[Taylor Brandstetter, 2016/10/27 21:26:03]

Is it ever possible for transport_id to be empty here?

[Taylor Brandstetter, 2016/10/27 21:28:30]

Oh, I see now. It's possible given how "proxy_to_transport" works, but it's one
of those things that "shouldn't" ever happen. So I'd give it an RTC_DCHECK at
least.

[hbos, 2016/10/28 10:03:48]

Done.

+          inbound_audio->transport_id = transport_id;
+        report->AddStats(std::move(inbound_audio));
+      }
+      // Outbound
       for (const cricket::VoiceSenderInfo& voice_sender_info :
            voice_media_info.senders) {
         // TODO(nisse): SSRC == 0 currently means none. Delete check when that
@@ -489,6 +552,25 @@ void RTCStatsCollector::ProduceRTPStreamStats_s(
     if (pc_->session()->video_channel()->GetStats(&video_media_info)) {
       std::string transport_id = RTCTransportStatsIDFromBaseChannel(
           session_stats.proxy_to_transport, *pc_->session()->video_channel());
+      // Inbound
+      for (const cricket::VideoReceiverInfo& video_receiver_info :
+           video_media_info.receivers) {
+        // TODO(nisse): SSRC == 0 currently means none. Delete check when that
+        // is fixed.
+        if (video_receiver_info.ssrc() == 0)
+          continue;
+        std::unique_ptr<RTCInboundRTPStreamStats> inbound_video(
+            new RTCInboundRTPStreamStats(
+                RTCInboundRTPStreamStatsIDFromSSRC(
+                    false, video_receiver_info.ssrc()),
+                timestamp_us));
+        SetInboundRTPStreamStatsFromVideoReceiverInfo(
+            video_receiver_info, inbound_video.get());
+        if (!transport_id.empty())
+          inbound_video->transport_id = transport_id;
+        report->AddStats(std::move(inbound_video));
+      }
+      // Outbound
       for (const cricket::VideoSenderInfo& video_sender_info :
            video_media_info.senders) {
         // TODO(nisse): SSRC == 0 currently means none. Delete check when that