Pass label and plot style to the TimeSeries' constructor.

webrtc/tools/event_log_visualizer/analyzer.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 554 matching lines @@
                                          Plot* plot) {
   for (auto& kv : rtp_packets_) {
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != desired_direction ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_)) {
       continue;
     }
 
-    TimeSeries time_series;
-    time_series.label = GetStreamName(stream_id);
-    time_series.style = BAR_GRAPH;
+    TimeSeries time_series(GetStreamName(stream_id), BAR_GRAPH);
     ProcessPoints<LoggedRtpPacket>(
         [](const LoggedRtpPacket& packet) -> rtc::Optional<float> {
           return rtc::Optional<float>(packet.total_length);
         },
         packet_stream, begin_time_, &time_series);
     plot->series_list_.push_back(std::move(time_series));
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Packet size (bytes)", kBottomMargin,
@@ skipping 13 matching lines @@
     const std::string& label_prefix) {
   for (auto& kv : packets) {
     StreamId stream_id = kv.first;
     const std::vector<T>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != desired_direction ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_)) {
       continue;
     }
 
-    TimeSeries time_series;
-    time_series.label = label_prefix + " " + GetStreamName(stream_id);
-    time_series.style = LINE_STEP_GRAPH;
-
+    std::string label = label_prefix + " " + GetStreamName(stream_id);
+    TimeSeries time_series(label, LINE_STEP_GRAPH);
     for (size_t i = 0; i < packet_stream.size(); i++) {
       float x = static_cast<float>(packet_stream[i].timestamp - begin_time_) /
                 1000000;
       time_series.points.emplace_back(x, i + 1);
     }
 
     plot->series_list_.push_back(std::move(time_series));
   }
 }
 
@@ skipping 90 matching lines @@
 void EventLogAnalyzer::CreateSequenceNumberGraph(Plot* plot) {
   for (auto& kv : rtp_packets_) {
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != kIncomingPacket ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_)) {
       continue;
     }
 
-    TimeSeries time_series;
-    time_series.label = GetStreamName(stream_id);
-    time_series.style = BAR_GRAPH;
+    TimeSeries time_series(GetStreamName(stream_id), BAR_GRAPH);
     ProcessPairs<LoggedRtpPacket, float>(
         [](const LoggedRtpPacket& old_packet,
            const LoggedRtpPacket& new_packet) {
           int64_t diff =
               WrappingDifference(new_packet.header.sequenceNumber,
                                  old_packet.header.sequenceNumber, 1ul << 16);
           return rtc::Optional<float>(diff);
         },
         packet_stream, begin_time_, &time_series);
     plot->series_list_.push_back(std::move(time_series));
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Difference since last packet", kBottomMargin,
                           kTopMargin);
   plot->SetTitle("Sequence number");
 }
 
 void EventLogAnalyzer::CreateIncomingPacketLossGraph(Plot* plot) {
   for (auto& kv : rtp_packets_) {
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != kIncomingPacket ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_) ||
         packet_stream.size() == 0) {
       continue;
     }
 
-    TimeSeries time_series;
-    time_series.label = GetStreamName(stream_id);
-    time_series.style = LINE_DOT_GRAPH;
+    TimeSeries time_series(GetStreamName(stream_id), LINE_DOT_GRAPH);
     const uint64_t kWindowUs = 1000000;
     const uint64_t kStep = 1000000;
     SequenceNumberUnwrapper unwrapper_;
     SequenceNumberUnwrapper prior_unwrapper_;
     size_t window_index_begin = 0;
     size_t window_index_end = 0;
     int64_t highest_seq_number =
         unwrapper_.Unwrap(packet_stream[0].header.sequenceNumber) - 1;
     int64_t highest_prior_seq_number =
         prior_unwrapper_.Unwrap(packet_stream[0].header.sequenceNumber) - 1;
@@ skipping 37 matching lines @@
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != kIncomingPacket ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_) ||
         IsAudioSsrc(stream_id) || !IsVideoSsrc(stream_id) ||
         IsRtxSsrc(stream_id)) {
       continue;
     }
 
-    TimeSeries capture_time_data;
-    capture_time_data.label = GetStreamName(stream_id) + " capture-time";
-    capture_time_data.style = BAR_GRAPH;
+    TimeSeries capture_time_data(GetStreamName(stream_id) + " capture-time",
+                                 BAR_GRAPH);
     ProcessPairs<LoggedRtpPacket, double>(NetworkDelayDiff_CaptureTime,
                                           packet_stream, begin_time_,
                                           &capture_time_data);
     plot->series_list_.push_back(std::move(capture_time_data));
 
-    TimeSeries send_time_data;
-    send_time_data.label = GetStreamName(stream_id) + " abs-send-time";
-    send_time_data.style = BAR_GRAPH;
+    TimeSeries send_time_data(GetStreamName(stream_id) + " abs-send-time",
+                              BAR_GRAPH);
     ProcessPairs<LoggedRtpPacket, double>(NetworkDelayDiff_AbsSendTime,
                                           packet_stream, begin_time_,
                                           &send_time_data);
     plot->series_list_.push_back(std::move(send_time_data));
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Latency change (ms)", kBottomMargin,
                           kTopMargin);
   plot->SetTitle("Network latency change between consecutive packets");
 }
 
 void EventLogAnalyzer::CreateAccumulatedDelayChangeGraph(Plot* plot) {
   for (auto& kv : rtp_packets_) {
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != kIncomingPacket ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_) ||
         IsAudioSsrc(stream_id) || !IsVideoSsrc(stream_id) ||
         IsRtxSsrc(stream_id)) {
       continue;
     }
 
-    TimeSeries capture_time_data;
-    capture_time_data.label = GetStreamName(stream_id) + " capture-time";
-    capture_time_data.style = LINE_GRAPH;
+    TimeSeries capture_time_data(GetStreamName(stream_id) + " capture-time",
+                                 LINE_GRAPH);
     AccumulatePairs<LoggedRtpPacket, double>(NetworkDelayDiff_CaptureTime,
                                              packet_stream, begin_time_,
                                              &capture_time_data);
     plot->series_list_.push_back(std::move(capture_time_data));
 
-    TimeSeries send_time_data;
-    send_time_data.label = GetStreamName(stream_id) + " abs-send-time";
-    send_time_data.style = LINE_GRAPH;
+    TimeSeries send_time_data(GetStreamName(stream_id) + " abs-send-time",
+                              LINE_GRAPH);
     AccumulatePairs<LoggedRtpPacket, double>(NetworkDelayDiff_AbsSendTime,
                                              packet_stream, begin_time_,
                                              &send_time_data);
     plot->series_list_.push_back(std::move(send_time_data));
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Latency change (ms)", kBottomMargin,
                           kTopMargin);
   plot->SetTitle("Accumulated network latency change");
 }
 
 // Plot the fraction of packets lost (as perceived by the loss-based BWE).
 void EventLogAnalyzer::CreateFractionLossGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Fraction lost", LINE_DOT_GRAPH);
   for (auto& bwe_update : bwe_loss_updates_) {
     float x = static_cast<float>(bwe_update.timestamp - begin_time_) / 1000000;
     float y = static_cast<float>(bwe_update.fraction_loss) / 255 * 100;
-    plot->series_list_.back().points.emplace_back(x, y);
+    time_series->points.emplace_back(x, y);
   }
-  plot->series_list_.back().label = "Fraction lost";
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 10, "Percent lost packets", kBottomMargin,
                           kTopMargin);
   plot->SetTitle("Reported packet loss");
 }
 
 // Plot the total bandwidth used by all RTP streams.
 void EventLogAnalyzer::CreateTotalBitrateGraph(
     PacketDirection desired_direction,
@@ skipping 19 matching lines @@
         packets.push_back(TimestampSize(timestamp, total_length));
       }
     }
   }
 
   size_t window_index_begin = 0;
   size_t window_index_end = 0;
   size_t bytes_in_window = 0;
 
   // Calculate a moving average of the bitrate and store in a TimeSeries.
-  plot->series_list_.push_back(TimeSeries());
+  TimeSeries* time_series = plot->AddTimeSeries("Bitrate", LINE_GRAPH);
   for (uint64_t time = begin_time_; time < end_time_ + step_; time += step_) {
     while (window_index_end < packets.size() &&
            packets[window_index_end].timestamp < time) {
       bytes_in_window += packets[window_index_end].size;
       ++window_index_end;
     }
     while (window_index_begin < packets.size() &&
            packets[window_index_begin].timestamp < time - window_duration_) {
       RTC_DCHECK_LE(packets[window_index_begin].size, bytes_in_window);
       bytes_in_window -= packets[window_index_begin].size;
       ++window_index_begin;
     }
     float window_duration_in_seconds =
         static_cast<float>(window_duration_) / 1000000;
     float x = static_cast<float>(time - begin_time_) / 1000000;
     float y = bytes_in_window * 8 / window_duration_in_seconds / 1000;
-    plot->series_list_.back().points.push_back(TimeSeriesPoint(x, y));
+    time_series->points.emplace_back(x, y);
   }
 
-  // Set labels.
-  if (desired_direction == webrtc::PacketDirection::kIncomingPacket) {
-    plot->series_list_.back().label = "Incoming bitrate";
-  } else if (desired_direction == webrtc::PacketDirection::kOutgoingPacket) {
-    plot->series_list_.back().label = "Outgoing bitrate";
-  }
-  plot->series_list_.back().style = LINE_GRAPH;
-
   // Overlay the send-side bandwidth estimate over the outgoing bitrate.
   if (desired_direction == kOutgoingPacket) {
-    plot->series_list_.push_back(TimeSeries());
+    TimeSeries* time_series =
+        plot->AddTimeSeries("Loss-based estimate", LINE_STEP_GRAPH);
     for (auto& bwe_update : bwe_loss_updates_) {
       float x =
           static_cast<float>(bwe_update.timestamp - begin_time_) / 1000000;
       float y = static_cast<float>(bwe_update.new_bitrate) / 1000;
-      plot->series_list_.back().points.emplace_back(x, y);
+      time_series->points.emplace_back(x, y);
     }
-    plot->series_list_.back().label = "Loss-based estimate";
-    plot->series_list_.back().style = LINE_STEP_GRAPH;
   }
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Bitrate (kbps)", kBottomMargin, kTopMargin);
   if (desired_direction == webrtc::PacketDirection::kIncomingPacket) {
     plot->SetTitle("Incoming RTP bitrate");
   } else if (desired_direction == webrtc::PacketDirection::kOutgoingPacket) {
     plot->SetTitle("Outgoing RTP bitrate");
   }
 }
 
 // For each SSRC, plot the bandwidth used by that stream.
 void EventLogAnalyzer::CreateStreamBitrateGraph(
     PacketDirection desired_direction,
     Plot* plot) {
   for (auto& kv : rtp_packets_) {
     StreamId stream_id = kv.first;
     const std::vector<LoggedRtpPacket>& packet_stream = kv.second;
     // Filter on direction and SSRC.
     if (stream_id.GetDirection() != desired_direction ||
         !MatchingSsrc(stream_id.GetSsrc(), desired_ssrc_)) {
       continue;
     }
 
-    TimeSeries time_series;
-    time_series.label = GetStreamName(stream_id);
-    time_series.style = LINE_GRAPH;
+    TimeSeries time_series(GetStreamName(stream_id), LINE_GRAPH);
     MovingAverage<LoggedRtpPacket, double>(
         [](const LoggedRtpPacket& packet) {
           return rtc::Optional<double>(packet.total_length * 8.0 / 1000.0);
         },
         packet_stream, begin_time_, end_time_, window_duration_, step_,
         &time_series);
     plot->series_list_.push_back(std::move(time_series));
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
@@ skipping 27 matching lines @@
   SimulatedClock clock(0);
   BitrateObserver observer;
   RtcEventLogNullImpl null_event_log;
   PacketRouter packet_router;
   CongestionController cc(&clock, &observer, &observer, &null_event_log,
                           &packet_router);
   // TODO(holmer): Log the call config and use that here instead.
   static const uint32_t kDefaultStartBitrateBps = 300000;
   cc.SetBweBitrates(0, kDefaultStartBitrateBps, -1);
 
-  TimeSeries time_series;
-  time_series.label = "Delay-based estimate";
-  time_series.style = LINE_DOT_GRAPH;
-  TimeSeries acked_time_series;
-  acked_time_series.label = "Acked bitrate";
-  acked_time_series.style = LINE_DOT_GRAPH;
+  TimeSeries time_series("Delay-based estimate", LINE_DOT_GRAPH);
+  TimeSeries acked_time_series("Acked bitrate", LINE_DOT_GRAPH);
 
   auto rtp_iterator = outgoing_rtp.begin();
   auto rtcp_iterator = incoming_rtcp.begin();
 
   auto NextRtpTime = [&]() {
     if (rtp_iterator != outgoing_rtp.end())
       return static_cast<int64_t>(rtp_iterator->first);
     return std::numeric_limits<int64_t>::max();
   };
 
@@ skipping 92 matching lines @@
     if (kv.first.GetDirection() == PacketDirection::kIncomingPacket) {
       for (const LoggedRtcpPacket& rtcp_packet : kv.second)
         incoming_rtcp.insert(
             std::make_pair(rtcp_packet.timestamp, &rtcp_packet));
     }
   }
 
   SimulatedClock clock(0);
   TransportFeedbackAdapter feedback_adapter(&clock);
 
-  TimeSeries time_series;
-  time_series.label = "Network Delay Change";
-  time_series.style = LINE_DOT_GRAPH;
+  TimeSeries time_series("Network Delay Change", LINE_DOT_GRAPH);
   int64_t estimated_base_delay_ms = std::numeric_limits<int64_t>::max();
 
   auto rtp_iterator = outgoing_rtp.begin();
   auto rtcp_iterator = incoming_rtcp.begin();
 
   auto NextRtpTime = [&]() {
     if (rtp_iterator != outgoing_rtp.end())
       return static_cast<int64_t>(rtp_iterator->first);
     return std::numeric_limits<int64_t>::max();
   };
@@ skipping 80 matching lines @@
   }
   return timestamps;
 }
 
 void EventLogAnalyzer::CreateTimestampGraph(Plot* plot) {
   for (const auto& kv : rtp_packets_) {
     const std::vector<LoggedRtpPacket>& rtp_packets = kv.second;
     StreamId stream_id = kv.first;
 
     {
-      TimeSeries timestamp_data;
-      timestamp_data.label = GetStreamName(stream_id) + " capture-time";
-      timestamp_data.style = LINE_DOT_GRAPH;
+      TimeSeries timestamp_data(GetStreamName(stream_id) + " capture-time",
+                                LINE_DOT_GRAPH);
       for (LoggedRtpPacket packet : rtp_packets) {
         float x = static_cast<float>(packet.timestamp - begin_time_) / 1000000;
         float y = packet.header.timestamp;
         timestamp_data.points.emplace_back(x, y);
       }
       plot->series_list_.push_back(std::move(timestamp_data));
     }
 
     {
       auto kv = rtcp_packets_.find(stream_id);
       if (kv != rtcp_packets_.end()) {
         const auto& packets = kv->second;
-        TimeSeries timestamp_data;
-        timestamp_data.label = GetStreamName(stream_id) + " rtcp capture-time";
-        timestamp_data.style = LINE_DOT_GRAPH;
+        TimeSeries timestamp_data(
+            GetStreamName(stream_id) + " rtcp capture-time", LINE_DOT_GRAPH);
         for (const LoggedRtcpPacket& rtcp : packets) {
           if (rtcp.type != kRtcpSr)
             continue;
           rtcp::SenderReport* sr;
           sr = static_cast<rtcp::SenderReport*>(rtcp.packet.get());
           float x = static_cast<float>(rtcp.timestamp - begin_time_) / 1000000;
           float y = sr->rtp_timestamp();
           timestamp_data.points.emplace_back(x, y);
         }
         plot->series_list_.push_back(std::move(timestamp_data));
       }
     }
   }
 
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Timestamp (90khz)", kBottomMargin, kTopMargin);
   plot->SetTitle("Timestamps");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderTargetBitrateGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder target bitrate";
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Audio encoder target bitrate", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) -> rtc::Optional<float> {
         if (ana_event.config.bitrate_bps)
           return rtc::Optional<float>(
               static_cast<float>(*ana_event.config.bitrate_bps));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Bitrate (bps)", kBottomMargin, kTopMargin);
   plot->SetTitle("Reported audio encoder target bitrate");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderFrameLengthGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder frame length";
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Audio encoder frame length", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) {
         if (ana_event.config.frame_length_ms)
           return rtc::Optional<float>(
               static_cast<float>(*ana_event.config.frame_length_ms));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Frame length (ms)", kBottomMargin, kTopMargin);
   plot->SetTitle("Reported audio encoder frame length");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderUplinkPacketLossFractionGraph(
     Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder uplink packet loss fraction";
+  TimeSeries* time_series = plot->AddTimeSeries(
+      "Audio encoder uplink packet loss fraction", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) {
         if (ana_event.config.uplink_packet_loss_fraction)
           return rtc::Optional<float>(static_cast<float>(
               *ana_event.config.uplink_packet_loss_fraction));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 10, "Percent lost packets", kBottomMargin,
                           kTopMargin);
   plot->SetTitle("Reported audio encoder lost packets");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderEnableFecGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder FEC";
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Audio encoder FEC", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) {
         if (ana_event.config.enable_fec)
           return rtc::Optional<float>(
               static_cast<float>(*ana_event.config.enable_fec));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "FEC (false/true)", kBottomMargin, kTopMargin);
   plot->SetTitle("Reported audio encoder FEC");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderEnableDtxGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder DTX";
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Audio encoder DTX", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) {
         if (ana_event.config.enable_dtx)
           return rtc::Optional<float>(
               static_cast<float>(*ana_event.config.enable_dtx));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "DTX (false/true)", kBottomMargin, kTopMargin);
   plot->SetTitle("Reported audio encoder DTX");
 }
 
 void EventLogAnalyzer::CreateAudioEncoderNumChannelsGraph(Plot* plot) {
-  plot->series_list_.push_back(TimeSeries());
-  plot->series_list_.back().style = LINE_DOT_GRAPH;
-  plot->series_list_.back().label = "Audio encoder number of channels";
+  TimeSeries* time_series =
+      plot->AddTimeSeries("Audio encoder number of channels", LINE_DOT_GRAPH);
   ProcessPoints<AudioNetworkAdaptationEvent>(
       [](const AudioNetworkAdaptationEvent& ana_event) {
         if (ana_event.config.num_channels)
           return rtc::Optional<float>(
               static_cast<float>(*ana_event.config.num_channels));
         return rtc::Optional<float>();
       },
-      audio_network_adaptation_events_, begin_time_,
-      &plot->series_list_.back());
+      audio_network_adaptation_events_, begin_time_, time_series);
   plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
   plot->SetSuggestedYAxis(0, 1, "Number of channels (1 (mono)/2 (stereo))",
                           kBottomMargin, kTopMargin);
   plot->SetTitle("Reported audio encoder number of channels");
 }
 }  // namespace plotting
 }  // namespace webrtc