Revert of Remove audio/video distinction for probe packets.

webrtc/modules/congestion_controller/delay_based_bwe.h

 /*
  *  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 22 matching lines @@
 class DelayBasedBwe : public RemoteBitrateEstimator {
  public:
   explicit DelayBasedBwe(RemoteBitrateObserver* observer);
   virtual ~DelayBasedBwe() {}
 
   void IncomingPacketFeedbackVector(
       const std::vector<PacketInfo>& packet_feedback_vector) override;
 
   void IncomingPacket(int64_t arrival_time_ms,
                       size_t payload_size,
-                      const RTPHeader& header) override;
-
-  void IncomingPacket(int64_t arrival_time_ms,
-                      size_t payload_size,
                       const RTPHeader& header,
+                      bool was_paced) override;
+
+  void IncomingPacket(int64_t arrival_time_ms,
+                      size_t payload_size,
+                      const RTPHeader& header,
+                      bool was_paced,
                       int probe_cluster_id);
 
   // This class relies on Process() being called periodically (at least once
   // every other second) for streams to be timed out properly. Therefore it
   // shouldn't be detached from the ProcessThread except if it's about to be
   // deleted.
   void Process() override;
   int64_t TimeUntilNextProcess() override;
   void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
   void RemoveStream(uint32_t ssrc) override;
@@ skipping 45 matching lines @@
 
   typedef std::map<uint32_t, int64_t> Ssrcs;
   enum class ProbeResult { kBitrateUpdated, kNoUpdate };
 
   static void AddCluster(std::list<Cluster>* clusters, Cluster* cluster);
 
   void IncomingPacketInfo(int64_t arrival_time_ms,
                           uint32_t send_time_24bits,
                           size_t payload_size,
                           uint32_t ssrc,
+                          bool was_paced,
                           int probe_cluster_id);
 
   void ComputeClusters(std::list<Cluster>* clusters) const;
 
   std::list<Cluster>::const_iterator FindBestProbe(
       const std::list<Cluster>& clusters) const;
 
   // Returns true if a probe which changed the estimate was detected.
   ProbeResult ProcessClusters(int64_t now_ms) EXCLUSIVE_LOCKS_REQUIRED(&crit_);
 
@@ skipping 18 matching lines @@
   rtc::CriticalSection crit_;
   Ssrcs ssrcs_ GUARDED_BY(&crit_);
   AimdRateControl remote_rate_ GUARDED_BY(&crit_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_