Fix bug in BitrateProber where an old probe added at a high bitrate will stay active indefinit…

webrtc/modules/pacing/bitrate_prober.h

 /*
  *  Copyright (c) 2014 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 20 matching lines @@
   // TimeUntilNextProbe().
   bool IsProbing() const;
 
   // Initializes a new probing session if the prober is allowed to probe. Does
   // not initialize the prober unless the packet size is large enough to probe
   // with.
   void OnIncomingPacket(size_t packet_size);
 
   // Create a cluster used to probe for |bitrate_bps| with |num_probes| number
   // of probes.
-  void CreateProbeCluster(int bitrate_bps);
+  void CreateProbeCluster(int bitrate_bps, int64_t now_ms);
 
   // Returns the number of milliseconds until the next probe should be sent to
   // get accurate probing.
   int TimeUntilNextProbe(int64_t now_ms);
 
   // Which cluster that is currently being used for probing.
   int CurrentClusterId() const;
 
   // Returns the minimum number of bytes that the prober recommends for
   // the next probe.
@@ skipping 22 matching lines @@
   // A probe cluster consists of a set of probes. Each probe in turn can be
   // divided into a number of packets to accommodate the MTU on the network.
   struct ProbeCluster {
     int min_probes = 0;
     int min_bytes = 0;
     int bitrate_bps = 0;
     int id = -1;
 
     int sent_probes = 0;
     int sent_bytes = 0;
+    int64_t time_created_ms = -1;
     int64_t time_started_ms = -1;
 
     int retries = 0;
   };
 
   // Resets the state of the prober and clears any cluster/timing data tracked.
-  void ResetState();
+  void ResetState(int64_t now_ms);
 
   int64_t GetNextProbeTime(const ProbeCluster& cluster);
 
   ProbingState probing_state_;
 
   // Probe bitrate per packet. These are used to compute the delta relative to
   // the previous probe packet based on the size and time when that packet was
   // sent.
   std::queue<ProbeCluster> clusters_;
 
   // Time the next probe should be sent when in kActive state.
   int64_t next_probe_time_ms_;
 
   int next_cluster_id_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_PACING_BITRATE_PROBER_H_