Add support for transport wide sequence numbers

webrtc/video_engine/vie_channel_group.cc

 /*
  *  Copyright (c) 2012 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_engine/vie_channel_group.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common.h"
 #include "webrtc/experiments.h"
 #include "webrtc/modules/pacing/include/paced_sender.h"
 #include "webrtc/modules/pacing/include/packet_router.h"
+#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
 #include "webrtc/modules/utility/interface/process_thread.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/video_engine/call_stats.h"
 #include "webrtc/video_engine/encoder_state_feedback.h"
 #include "webrtc/video_engine/payload_router.h"
 #include "webrtc/video_engine/vie_channel.h"
@@ skipping 103 matching lines @@
   RemoteBitrateObserver* observer_;
   Clock* clock_;
   rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
   const uint32_t min_bitrate_bps_;
   rtc::scoped_ptr<RemoteBitrateEstimator> rbe_;
   bool using_absolute_send_time_;
   uint32_t packets_since_absolute_send_time_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator);
 };
+
+static const int64_t kSendTimeHistoryWindowMs = 2000;
+
 }  // namespace
 
+class AdaptedSendTimeHistory : public SendTimeHistory, public SendTimeObserver {
+ public:
+  AdaptedSendTimeHistory() : SendTimeHistory(kSendTimeHistoryWindowMs) {}
+  virtual ~AdaptedSendTimeHistory() {}
+
+  void OnPacketSent(uint16_t sequence_number, int64_t send_time) override {
+    SendTimeHistory::AddAndRemoveOldSendTimes(sequence_number, send_time);
+  }
+
+  // Populate PacketInfo.send_time_ms, by looking up the send time in the
+  // stored history index by sequence number. Returns the number of PacketInfo
+  // instances for which the lookup was successful.
+  size_t PopulateSendTimes(std::vector<PacketInfo>* packet_info) {
+    return 0;
+    /*
+     *   rtc::CritScope cs(&history_lock_);
+  if (!send_time_history_.get())
+    return 0;
+
+  size_t successful_lookups = 0;
+  for (PacketInfo& info : *packet_info) {
+    if (send_time_history_->GetSendTime(info.sequence_number,
+                                        &info.send_time_ms, true)) {
+      ++successful_lookups;
+    }
+  }
+  return successful_lookups;
+     */

[stefan-webrtc, 2015/07/29 09:04:11]

Probably want to remove this comment? :)

[sprang_webrtc, 2015/07/29 10:03:25]

Yes, even the whole method. Moved to a different CL :)

+  }
+};
+
 ChannelGroup::ChannelGroup(ProcessThread* process_thread)
     : remb_(new VieRemb()),
       bitrate_allocator_(new BitrateAllocator()),
       call_stats_(new CallStats()),
       encoder_state_feedback_(new EncoderStateFeedback()),
       packet_router_(new PacketRouter()),
       pacer_(new PacedSender(Clock::GetRealTimeClock(),
                              packet_router_.get(),
                              BitrateController::kDefaultStartBitrateKbps,
                              PacedSender::kDefaultPaceMultiplier *
                                  BitrateController::kDefaultStartBitrateKbps,
                              0)),
       encoder_map_cs_(CriticalSectionWrapper::CreateCriticalSection()),
       config_(new Config),
       process_thread_(process_thread),
       pacer_thread_(ProcessThread::Create()),
       // Constructed last as this object calls the provided callback on
       // construction.
       bitrate_controller_(
           BitrateController::CreateBitrateController(Clock::GetRealTimeClock(),
-                                                     this)) {
+                                                     this)),
+      send_time_history_(new AdaptedSendTimeHistory()) {
   remote_bitrate_estimator_.reset(new WrappingBitrateEstimator(
       remb_.get(), Clock::GetRealTimeClock(), *config_.get()));
 
   call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get());
 
   pacer_thread_->RegisterModule(pacer_.get());
   pacer_thread_->Start();
 
   process_thread->RegisterModule(remote_bitrate_estimator_.get());
   process_thread->RegisterModule(call_stats_.get());
@@ skipping 67 matching lines @@
                                  ViEEncoder* vie_encoder,
                                  size_t max_rtp_streams,
                                  bool sender,
                                  bool disable_default_encoder) {
   DCHECK(vie_encoder);
 
   rtc::scoped_ptr<ViEChannel> channel(new ViEChannel(
       channel_id, engine_id, number_of_cores, *config_.get(), transport,
       process_thread_, encoder_state_feedback_->GetRtcpIntraFrameObserver(),
       bitrate_controller_->CreateRtcpBandwidthObserver(),
-      remote_bitrate_estimator_.get(), call_stats_->rtcp_rtt_stats(),
-      pacer_.get(), packet_router_.get(), max_rtp_streams, sender,
-      disable_default_encoder));
+      send_time_history_.get(), remote_bitrate_estimator_.get(),
+      call_stats_->rtcp_rtt_stats(), pacer_.get(), packet_router_.get(),
+      max_rtp_streams, sender, disable_default_encoder));
   if (channel->Init() != 0) {
     return false;
   }
   if (!disable_default_encoder) {
     VideoCodec encoder;
     if (vie_encoder->GetEncoder(&encoder) != 0) {
       return false;
     }
     if (sender && channel->SetSendCodec(encoder) != 0) {
       return false;
@@ skipping 215 matching lines @@
     CriticalSectionScoped lock(encoder_map_cs_.get());
     for (const auto& encoder : send_encoders_)
       pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps();
   }
   pacer_->UpdateBitrate(
       target_bitrate_bps / 1000,
       PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
       pad_up_to_bitrate_bps / 1000);
 }
 }  // namespace webrtc