Reland: Implement NetEq's CurrentDelay function

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.
  */
 
@@ skipping 197 matching lines @@
   // the user defined limits (applied by calling setMinimumDelay() and/or
   // SetMaximumDelay()) are applied.
   virtual int LeastRequiredDelayMs() const = 0;
 
   // Not implemented.
   virtual int SetTargetDelay() = 0;
 
   // Not implemented.
   virtual int TargetDelay() = 0;
 
-  // Not implemented.
-  virtual int CurrentDelay() = 0;
+  // Returns the current total delay (packet buffer and sync buffer) in ms.
+  virtual int CurrentDelayMs() const = 0;
 
   // Sets the playout mode to |mode|.
   // Deprecated. Set the mode in the Config struct passed to the constructor.
   // TODO(henrik.lundin) Delete.
   virtual void SetPlayoutMode(NetEqPlayoutMode mode) = 0;
 
   // Returns the current playout mode.
   // Deprecated.
   // TODO(henrik.lundin) Delete.
   virtual NetEqPlayoutMode PlayoutMode() const = 0;
@@ skipping 49 matching lines @@
 
  protected:
   NetEq() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetEq);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_