NetEq/ACM: Refactor how packet waiting times are calculated

webrtc/modules/audio_coding/neteq/interface/neteq.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
 
 #include <string.h>  // Provide access to size_t.
 
 #include <string>
-#include <vector>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Forward declarations.
 struct WebRtcRTPHeader;
@@ skipping 11 matching lines @@
                                 // speech inserted through expansion (in Q14).
   uint16_t preemptive_rate;  // Fraction of data inserted through pre-emptive
                              // expansion (in Q14).
   uint16_t accelerate_rate;  // Fraction of data removed through acceleration
                              // (in Q14).
   uint16_t secondary_decoded_rate;  // Fraction of data coming from secondary
                                     // decoding (in Q14).
   int32_t clockdrift_ppm;  // Average clock-drift in parts-per-million
                            // (positive or negative).
   int added_zero_samples;  // Number of zero samples added in "off" mode.
+  // Statistics for packet waiting times, i.e., the time between a packet
+  // arrives until it is decoded.
+  int mean_waiting_time_ms;
+  int median_waiting_time_ms;
+  int min_waiting_time_ms;
+  int max_waiting_time_ms;
 };
 
 enum NetEqOutputType {
   kOutputNormal,
   kOutputPLC,
   kOutputCNG,
   kOutputPLCtoCNG,
   kOutputVADPassive
 };
 
@@ skipping 161 matching lines @@
 
   // Returns the current playout mode.
   // Deprecated.
   // TODO(henrik.lundin) Delete.
   virtual NetEqPlayoutMode PlayoutMode() const = 0;
 
   // Writes the current network statistics to |stats|. The statistics are reset
   // after the call.
   virtual int NetworkStatistics(NetEqNetworkStatistics* stats) = 0;
 
-  // Writes the last packet waiting times (in ms) to |waiting_times|. The number
-  // of values written is no more than 100, but may be smaller if the interface
-  // is polled again before 100 packets has arrived.
-  virtual void WaitingTimes(std::vector<int>* waiting_times) = 0;
-
   // Writes the current RTCP statistics to |stats|. The statistics are reset
   // and a new report period is started with the call.
   virtual void GetRtcpStatistics(RtcpStatistics* stats) = 0;
 
   // Same as RtcpStatistics(), but does not reset anything.
   virtual void GetRtcpStatisticsNoReset(RtcpStatistics* stats) = 0;
 
   // Enables post-decode VAD. When enabled, GetAudio() will return
   // kOutputVADPassive when the signal contains no speech.
   virtual void EnableVad() = 0;
@@ skipping 34 matching lines @@
 
  protected:
   NetEq() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetEq);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_