From adafe0b70aefd5fa312b3b9f3455acfcb7b076f4 Mon Sep 17 00:00:00 2001
From: terelius <terelius@webrtc.org>
Date: Thu, 26 May 2016 01:58:40 -0700
Subject: [PATCH] Properly wire up the event log to the VideoSendStream.

Also set the Configuration parameters in CreateRtpRtcpModules in the same order as the members are declared.

BUG=webrtc:5917

Review-Url: https://codereview.webrtc.org/2011433002
Cr-Commit-Position: refs/heads/master@{#12905}
---
 webrtc/call/call.cc               | 2 +-
 webrtc/video/video_send_stream.cc | 8 ++++++--
 webrtc/video/video_send_stream.h  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index f7c66db4b2..e3c6ec7a0c 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -413,7 +413,7 @@ webrtc::VideoSendStream* Call::CreateVideoSendStream(
   VideoSendStream* send_stream = new VideoSendStream(
       num_cpu_cores_, module_process_thread_.get(), call_stats_.get(),
       congestion_controller_.get(), bitrate_allocator_.get(),
-      video_send_delay_stats_.get(), &remb_, config, encoder_config,
+      video_send_delay_stats_.get(), &remb_, event_log_, config, encoder_config,
       suspended_video_send_ssrcs_);
   {
     WriteLockScoped write_lock(*send_crit_);
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 31ba5ee31c..e42b9234fa 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -49,6 +49,7 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
     TransportSequenceNumberAllocator* transport_sequence_number_allocator,
     SendStatisticsProxy* stats_proxy,
     SendDelayStats* send_delay_stats,
+    RtcEventLog* event_log,
     size_t num_modules) {
   RTC_DCHECK_GT(num_modules, 0u);
   RtpRtcp::Configuration configuration;
@@ -58,6 +59,8 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
   configuration.receive_statistics = null_receive_statistics;
   configuration.outgoing_transport = outgoing_transport;
   configuration.intra_frame_callback = intra_frame_callback;
+  configuration.bandwidth_callback = bandwidth_callback;
+  configuration.transport_feedback_callback = transport_feedback_callback;
   configuration.rtt_stats = rtt_stats;
   configuration.rtcp_packet_type_counter_observer = stats_proxy;
   configuration.paced_sender = paced_sender;
@@ -67,8 +70,7 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
   configuration.send_frame_count_observer = stats_proxy;
   configuration.send_side_delay_observer = stats_proxy;
   configuration.send_packet_observer = send_delay_stats;
-  configuration.bandwidth_callback = bandwidth_callback;
-  configuration.transport_feedback_callback = transport_feedback_callback;
+  configuration.event_log = event_log;
 
   std::vector<RtpRtcp*> modules;
   for (size_t i = 0; i < num_modules; ++i) {
@@ -353,6 +355,7 @@ VideoSendStream::VideoSendStream(
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
     VieRemb* remb,
+    RtcEventLog* event_log,
     const VideoSendStream::Config& config,
     const VideoEncoderConfig& encoder_config,
     const std::map<uint32_t, RtpState>& suspended_ssrcs)
@@ -397,6 +400,7 @@ VideoSendStream::VideoSendStream(
           congestion_controller_->packet_router(),
           &stats_proxy_,
           send_delay_stats,
+          event_log,
           config_.rtp.ssrcs.size())),
       payload_router_(rtp_rtcp_modules_, config.encoder_settings.payload_type),
       input_(&encoder_wakeup_event_,
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index fa6a7a7c16..51d8a4600b 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -39,6 +39,7 @@ class ProcessThread;
 class RtpRtcp;
 class ViEEncoder;
 class VieRemb;
+class RtcEventLog;
 
 namespace vcm {
 class VideoSender;
@@ -59,6 +60,7 @@ class VideoSendStream : public webrtc::VideoSendStream,
                   BitrateAllocator* bitrate_allocator,
                   SendDelayStats* send_delay_stats,
                   VieRemb* remb,
+                  RtcEventLog* event_log,
                   const VideoSendStream::Config& config,
                   const VideoEncoderConfig& encoder_config,
                   const std::map<uint32_t, RtpState>& suspended_ssrcs);