1 files changed, 24 insertions, 4 deletions
diff --git a/test/pc/e2e/analyzer_helper.cc b/test/pc/e2e/analyzer_helper.cc
index f11b3bb803..852f0a3435 100644
--- a/test/pc/e2e/analyzer_helper.cc
+++ b/test/pc/e2e/analyzer_helper.cc
@@ -22,16 +22,36 @@ AnalyzerHelper::AnalyzerHelper() {
 void AnalyzerHelper::AddTrackToStreamMapping(std::string track_id,
                                              std::string stream_label) {
   RTC_DCHECK_RUN_ON(&signaling_sequence_checker_);
-  track_to_stream_map_.insert({std::move(track_id), std::move(stream_label)});
+  track_to_stream_map_.insert(
+      {std::move(track_id), StreamInfo{stream_label, stream_label}});
 }
 
-const std::string& AnalyzerHelper::GetStreamLabelFromTrackId(
-    const std::string& track_id) const {
+void AnalyzerHelper::AddTrackToStreamMapping(std::string track_id,
+                                             std::string stream_label,
+                                             std::string sync_group) {
+  RTC_DCHECK_RUN_ON(&signaling_sequence_checker_);
+  track_to_stream_map_.insert(
+      {std::move(track_id),
+       StreamInfo{std::move(stream_label), std::move(sync_group)}});
+}
+
+const AnalyzerHelper::StreamInfo& AnalyzerHelper::GetStreamInfoFromTrackId(
+    absl::string_view track_id) const {
   RTC_DCHECK_RUN_ON(&signaling_sequence_checker_);
-  auto track_to_stream_pair = track_to_stream_map_.find(track_id);
+  auto track_to_stream_pair = track_to_stream_map_.find(std::string(track_id));
   RTC_CHECK(track_to_stream_pair != track_to_stream_map_.end());
   return track_to_stream_pair->second;
 }
 
+absl::string_view AnalyzerHelper::GetStreamLabelFromTrackId(
+    absl::string_view track_id) const {
+  return GetStreamInfoFromTrackId(track_id).stream_label;
+}
+
+absl::string_view AnalyzerHelper::GetSyncGroupLabelFromTrackId(
+    absl::string_view track_id) const {
+  return GetStreamInfoFromTrackId(track_id).sync_group;
+}
+
 }  // namespace webrtc_pc_e2e
 }  // namespace webrtc