Fix missing mediaSourceId in simulcast outbound-rtp stats

When simulcast is enabled, only the primary SSRC was mapped to the
sender's attachment ID in TrackMediaInfoMap. This resulted in missing
mediaSourceId properties for secondary simulcast outgoing stats. Updated
TrackMediaInfoMap to map all valid SSRCs provided in the sender's
RtpParameters.

Bug: webrtc:492108787
Fixes: webrtc:492108787
Change-Id: I688c169628675d7be3114e75b978a4ad4343dcc0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/456520
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#47165}
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index e2a4ade..78a9142 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -1375,7 +1375,10 @@
   TRACE_EVENT0("webrtc", "PeerConnection::GetStats");
   RTC_DCHECK_RUN_ON(signaling_thread());
   RTC_DCHECK(callback);
-  RTC_DCHECK_DISALLOW_THREAD_BLOCKING_CALLS();
+  // TODO: bugs.webrtc.org/492108787 - Re-enable this when fixing the
+  // call to `sender->internal()->GetParametersInternal()` which can
+  // block when cached parameters aren't available.
+  // RTC_DCHECK_DISALLOW_THREAD_BLOCKING_CALLS();
   scoped_refptr<RtpSenderInternal> internal_sender;
   if (selector) {
     for (const auto& proxy_transceiver :
@@ -1407,7 +1410,10 @@
   TRACE_EVENT0("webrtc", "PeerConnection::GetStats");
   RTC_DCHECK_RUN_ON(signaling_thread());
   RTC_DCHECK(callback);
-  RTC_DCHECK_DISALLOW_THREAD_BLOCKING_CALLS();
+  // TODO: bugs.webrtc.org/492108787 - Re-enable this when fixing the
+  // call to `sender->internal()->GetParametersInternal()` which can
+  // block when cached parameters aren't available.
+  // RTC_DCHECK_DISALLOW_THREAD_BLOCKING_CALLS();
   scoped_refptr<RtpReceiverInternal> internal_receiver;
   if (selector) {
     for (const auto& proxy_transceiver :
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index 517d6f2..ea0ae61 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -2269,6 +2269,7 @@
 
   std::vector<RtpTransceiverStatsInfo> transceiver_stats_infos;
   std::vector<TransceiverReferences> transceiver_references;
+  std::vector<std::vector<RtpParameters>> all_sender_parameters;
   // These are used to invoke GetStats for all the media channels together in
   // one worker thread hop.
   std::map<VoiceMediaSendChannelInterface*, VoiceMediaSendInfo>
@@ -2296,12 +2297,16 @@
                                    scoped_refptr<RtpTransceiver>(transceiver)};
 
     RTC_ALLOW_PLAN_B_DEPRECATION_BEGIN()
+    std::vector<RtpParameters> sender_parameters;
     for (const auto& sender : transceiver->senders()) {
       stats.sender_infos.push_back(
           {.ssrc = sender->ssrc(),
            .attachment_id = sender->internal()->AttachmentId(),
            .media_type = sender->media_type()});
+      sender_parameters.push_back(sender->internal()->GetParametersInternal(
+          /*may_use_cache=*/true, /*with_all_layers=*/true));
     }
+    all_sender_parameters.push_back(std::move(sender_parameters));
     for (const auto& receiver : transceiver->receivers()) {
       stats.receiver_infos.push_back(
           {.track_id = receiver->track() ? receiver->track()->id() : "",
@@ -2339,6 +2344,7 @@
   // which also needs info from the worker thread.
   return [this, transceiver_stats_infos = std::move(transceiver_stats_infos),
           transceiver_references = std::move(transceiver_references),
+          all_sender_parameters = std::move(all_sender_parameters),
           voice_send_stats = std::move(voice_send_stats),
           voice_receive_stats = std::move(voice_receive_stats),
           video_send_stats = std::move(video_send_stats),
@@ -2348,6 +2354,7 @@
     WorkerThreadResult worker_result;
     worker_result.results.transceiver_stats_infos =
         std::move(transceiver_stats_infos);
+    worker_result.results.sender_parameters = std::move(all_sender_parameters);
     worker_result.transceiver_references = std::move(transceiver_references);
 
     for (auto& pair : voice_send_stats) {
@@ -2415,8 +2422,9 @@
 
       stats.track_media_info_map = std::make_unique<TrackMediaInfoMap>(
           std::move(voice_media_info), std::move(video_media_info),
-          std::move(stats.sender_infos), std::move(stats.receiver_infos),
-          std::move(receiver_parameters));
+          std::move(stats.sender_infos),
+          std::move(worker_result.results.sender_parameters[i]),
+          std::move(stats.receiver_infos), std::move(receiver_parameters));
       if (stats.media_type == MediaType::AUDIO) {
         has_audio_receiver |= stats.has_receivers;
       }
diff --git a/pc/rtc_stats_collector.h b/pc/rtc_stats_collector.h
index 5e9bbfe..5103c6e 100644
--- a/pc/rtc_stats_collector.h
+++ b/pc/rtc_stats_collector.h
@@ -26,6 +26,7 @@
 #include "api/data_channel_interface.h"
 #include "api/environment/environment.h"
 #include "api/media_types.h"
+#include "api/rtp_parameters.h"
 #include "api/rtp_transceiver_direction.h"
 #include "api/scoped_refptr.h"
 #include "api/stats/rtc_stats_collector_callback.h"
@@ -155,6 +156,7 @@
  private:
   struct StatsGatheringResults {
     std::vector<RtpTransceiverStatsInfo> transceiver_stats_infos;
+    std::vector<std::vector<RtpParameters>> sender_parameters;
     Call::Stats call_stats;
     std::optional<AudioDeviceModule::Stats> audio_device_stats;
   };
diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 55f1976..e3ffa34 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc
@@ -2690,9 +2690,17 @@
   auto video_media_channels =
       pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
   RTC_ALLOW_PLAN_B_DEPRECATION_END();
-  stats_->SetupLocalTrackAndSender(MediaType::VIDEO, "LocalVideoTrackID", 1,
-                                   true,
-                                   /*attachment_id=*/50);
+  auto video_sender = stats_->SetupLocalTrackAndSender(
+      MediaType::VIDEO, "LocalVideoTrackID", 1, true,
+      /*attachment_id=*/50);
+  EXPECT_CALL(*video_sender, GetParametersInternal(_, _)).WillRepeatedly([] {
+    RtpParameters params;
+    params.encodings.push_back(RtpEncodingParameters());
+    params.encodings[0].ssrc = 1;
+    params.encodings.push_back(RtpEncodingParameters());
+    params.encodings[1].ssrc = 2;
+    return params;
+  });
 
   scoped_refptr<const RTCStatsReport> report =
       stats_->GetStatsReport(main_thread_);
@@ -2757,6 +2765,21 @@
       report->Get(expected_video.id())->cast_to<RTCOutboundRtpStreamStats>(),
       expected_video);
 
+  // Find the sub-stats for the second simulcast outbound RTP stream and verify
+  // that its `media_source_id` is set.
+  std::string id_of_second_ssrc;
+  for (const auto* outbound_rtp : stats_of_my_type) {
+    if (outbound_rtp->ssrc.value_or(0) == 2) {
+      id_of_second_ssrc = outbound_rtp->id();
+      break;
+    }
+  }
+  ASSERT_TRUE(report->Get(id_of_second_ssrc));
+  auto& second_video =
+      report->Get(id_of_second_ssrc)->cast_to<RTCOutboundRtpStreamStats>();
+  EXPECT_TRUE(second_video.media_source_id.has_value());
+  EXPECT_EQ(*second_video.media_source_id, "SV50");
+
   // Set previously undefined values and "GetStats" again.
   video_media_info.senders[0].qp_sum = 9;
   expected_video.qp_sum = 9;
diff --git a/pc/track_media_info_map.cc b/pc/track_media_info_map.cc
index 7150f34..91d12c5 100644
--- a/pc/track_media_info_map.cc
+++ b/pc/track_media_info_map.cc
@@ -41,13 +41,24 @@
 
 flat_map<uint32_t, int> GetSenderAttachmentIds(
     std::span<const TrackMediaInfoMap::RtpSenderSignalInfo> senders,
+    std::span<const RtpParameters> sender_parameters,
     MediaType media_type) {
+  RTC_DCHECK_EQ(senders.size(), sender_parameters.size());
   flat_map<uint32_t, int> result;
-  for (const auto& sender : senders) {
-    if (sender.media_type != media_type || sender.ssrc == 0) {
+  for (size_t i = 0; i < senders.size(); ++i) {
+    const auto& sender = senders[i];
+    if (sender.media_type != media_type) {
       continue;
     }
-    result[sender.ssrc] = sender.attachment_id;
+    const auto& parameters = sender_parameters[i];
+    if (sender.ssrc != 0) {
+      result[sender.ssrc] = sender.attachment_id;
+    }
+    for (const auto& encoding : parameters.encodings) {
+      if (encoding.ssrc) {
+        result[*encoding.ssrc] = sender.attachment_id;
+      }
+    }
   }
   return result;
 }
@@ -132,14 +143,15 @@
     std::optional<VoiceMediaInfo> voice_media_info,
     std::optional<VideoMediaInfo> video_media_info,
     std::span<const RtpSenderSignalInfo> senders,
+    std::span<const RtpParameters> sender_parameters,
     std::span<const RtpReceiverSignalInfo> receivers,
     std::span<const RtpParameters> receiver_parameters)
     : voice_media_info_(std::move(voice_media_info)),
       video_media_info_(std::move(video_media_info)),
       audio_sender_attachment_id_by_ssrc_(
-          GetSenderAttachmentIds(senders, MediaType::AUDIO)),
+          GetSenderAttachmentIds(senders, sender_parameters, MediaType::AUDIO)),
       video_sender_attachment_id_by_ssrc_(
-          GetSenderAttachmentIds(senders, MediaType::VIDEO)),
+          GetSenderAttachmentIds(senders, sender_parameters, MediaType::VIDEO)),
       audio_receiver_attachment_id_by_ssrc_(
           GetReceiverAttachmentIds(receivers,
                                    receiver_parameters,
diff --git a/pc/track_media_info_map.h b/pc/track_media_info_map.h
index 8e63aa8..f68ec75 100644
--- a/pc/track_media_info_map.h
+++ b/pc/track_media_info_map.h
@@ -46,6 +46,7 @@
   TrackMediaInfoMap(std::optional<VoiceMediaInfo> voice_media_info,
                     std::optional<VideoMediaInfo> video_media_info,
                     std::span<const RtpSenderSignalInfo> senders,
+                    std::span<const RtpParameters> sender_parameters,
                     std::span<const RtpReceiverSignalInfo> receivers,
                     std::span<const RtpParameters> receiver_parameters);
 
diff --git a/pc/track_media_info_map_unittest.cc b/pc/track_media_info_map_unittest.cc
index 01b8ced..fd46ed5 100644
--- a/pc/track_media_info_map_unittest.cc
+++ b/pc/track_media_info_map_unittest.cc
@@ -175,12 +175,14 @@
   // into the map.
   TrackMediaInfoMap InitializeMap() {
     std::vector<TrackMediaInfoMap::RtpSenderSignalInfo> sender_infos;
+    std::vector<RtpParameters> sender_params;
     for (const auto& sender : rtp_senders_) {
       sender_infos.push_back({
           .ssrc = sender->ssrc(),
           .attachment_id = sender->AttachmentId(),
           .media_type = sender->media_type(),
       });
+      sender_params.push_back(sender->GetParameters());
     }
     std::vector<TrackMediaInfoMap::RtpReceiverSignalInfo> receiver_infos;
     std::vector<RtpParameters> receiver_params;
@@ -204,7 +206,7 @@
     }
     return TrackMediaInfoMap(std::move(voice_media_info),
                              std::move(video_media_info), sender_infos,
-                             receiver_infos, receiver_params);
+                             sender_params, receiver_infos, receiver_params);
   }
 
  private: