Movable support for VideoReceiveStream::Config and avoid copies

webrtc/video/receive_statistics_proxy.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
 #include "webrtc/video/receive_statistics_proxy.h"
 
 #include <cmath>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
 
 ReceiveStatisticsProxy::ReceiveStatisticsProxy(
-    const VideoReceiveStream::Config& config,
+    const VideoReceiveStream::Config* config,
     Clock* clock)
     : clock_(clock),
-      config_(config),
+      config_(*config),
       // 1000ms window, scale 1000 for ms to s.
       decode_fps_estimator_(1000, 1000),
       renders_fps_estimator_(1000, 1000),
       render_fps_tracker_(100, 10u),
       render_pixel_tracker_(100, 10u) {
-  stats_.ssrc = config.rtp.remote_ssrc;
-  for (auto it : config.rtp.rtx)
+  stats_.ssrc = config_.rtp.remote_ssrc;
+  for (auto it : config_.rtp.rtx)
     rtx_stats_[it.second.ssrc] = StreamDataCounters();
 }
 
 ReceiveStatisticsProxy::~ReceiveStatisticsProxy() {
   UpdateHistograms();
 }
 
 void ReceiveStatisticsProxy::UpdateHistograms() {
   int fraction_lost = report_block_stats_.FractionLostInPercent();
   if (fraction_lost != -1) {
@@ skipping 78 matching lines @@
     RTC_LOGGED_HISTOGRAM_COUNTS_10000(
         "WebRTC.Video.RetransmittedBitrateReceivedInKbps",
         static_cast<int>(rtp_rtx.retransmitted.TotalBytes() * 8 / elapsed_sec /
                          1000));
     if (!rtx_stats_.empty()) {
       RTC_LOGGED_HISTOGRAM_COUNTS_10000(
           "WebRTC.Video.RtxBitrateReceivedInKbps",
           static_cast<int>(rtx.transmitted.TotalBytes() * 8 / elapsed_sec /
                            1000));
     }
     if (config_.rtp.fec.ulpfec_payload_type != -1) {

[mflodman, 2016/06/10 14:40:55]

Currently is this the only place we sue 'config_' after constructing an instance
of ReciveStatisticsProxy, so we could store only the ulpfec pl type instead of
config if we'd like. We might need more parts of the config in the future, so I
think it's fine either way.

[tommi, 2016/06/10 15:42:37]

That's a good point.  For now, I'll add a note in the header that points out
that we really don't need the full config pointer and what changes could be
made.

[mflodman, 2016/06/12 05:55:19]

SGTM

       RTC_LOGGED_HISTOGRAM_COUNTS_10000(
           "WebRTC.Video.FecBitrateReceivedInKbps",
           static_cast<int>(rtp_rtx.fec.TotalBytes() * 8 / elapsed_sec / 1000));
     }
     const RtcpPacketTypeCounter& counters = stats_.rtcp_packet_type_counts;
     RTC_LOGGED_HISTOGRAM_COUNTS_10000("WebRTC.Video.NackPacketsSentPerMinute",
                                       counters.nack_packets * 60 / elapsed_sec);
     RTC_LOGGED_HISTOGRAM_COUNTS_10000("WebRTC.Video.FirPacketsSentPerMinute",
                                       counters.fir_packets * 60 / elapsed_sec);
     RTC_LOGGED_HISTOGRAM_COUNTS_10000("WebRTC.Video.PliPacketsSentPerMinute",
@@ skipping 158 matching lines @@
   ++num_samples;
 }
 
 int ReceiveStatisticsProxy::SampleCounter::Avg(int min_required_samples) const {
   if (num_samples < min_required_samples || num_samples == 0)
     return -1;
   return sum / num_samples;
 }
 
 }  // namespace webrtc