From 3c9be1bc4df54376228d84d68a2006029c10bdf0 Mon Sep 17 00:00:00 2001
From: "pwestin@webrtc.org"
 <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 19 Jan 2012 15:55:54 +0000
Subject: [PATCH] Removed list wrapper fromr overuse detector. Review URL:
 https://webrtc-codereview.appspot.com/353004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1477 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../rtp_rtcp/source/overuse_detector.cc       | 45 +++++++------------
 .../rtp_rtcp/source/overuse_detector.h        |  5 ++-
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/modules/rtp_rtcp/source/overuse_detector.cc b/src/modules/rtp_rtcp/source/overuse_detector.cc
index eeeba9ab7c..4cffb0f655 100644
--- a/src/modules/rtp_rtcp/source/overuse_detector.cc
+++ b/src/modules/rtp_rtcp/source/overuse_detector.cc
@@ -85,12 +85,8 @@ OverUseDetector::~OverUseDetector()
         _plot4 = NULL;
     }
 #endif
-    while (!_tsDeltaHist.Empty())
-    {
-        ListItem* item = _tsDeltaHist.First();
-        delete static_cast<double*>(item->GetItem());
-        _tsDeltaHist.Erase(item);
-    }
+
+    _tsDeltaHist.clear();
 }
 
 void OverUseDetector::Reset()
@@ -117,12 +113,7 @@ void OverUseDetector::Reset()
     _timeOverUsing = -1;
     _overUseCounter = 0;
     _hypothesis = kBwNormal;
-    while (!_tsDeltaHist.Empty())
-    {
-        ListItem* item = _tsDeltaHist.First();
-        delete static_cast<double*>(item->GetItem());
-        _tsDeltaHist.Erase(item);
-    }
+    _tsDeltaHist.clear();
 }
 
 bool OverUseDetector::Update(const WebRtcRTPHeader& rtpHeader,
@@ -349,24 +340,18 @@ void OverUseDetector::UpdateKalman(WebRtc_Word64 tDelta, double tsDelta, WebRtc_
 #endif
 }
 
-double OverUseDetector::UpdateMinFramePeriod(double tsDelta)
-{
-    double minFramePeriod = tsDelta;
-    if (_tsDeltaHist.GetSize() >= MIN_FRAME_PERIOD_HISTORY_LEN)
-    {
-        ListItem* firstItem = _tsDeltaHist.First();
-        delete static_cast<double*>(firstItem->GetItem());
-        _tsDeltaHist.Erase(firstItem);
-    }
-    for (ListItem* item = _tsDeltaHist.First();
-        item != NULL;
-        item = _tsDeltaHist.Next(item))
-    {
-        const double* histDelta = static_cast<double*>(item->GetItem());
-        minFramePeriod = BWE_MIN(*histDelta, minFramePeriod);
-    }
-    _tsDeltaHist.PushBack(new double(tsDelta));
-    return minFramePeriod;
+double OverUseDetector::UpdateMinFramePeriod(double tsDelta) {
+  double minFramePeriod = tsDelta;
+  if (_tsDeltaHist.size() >= MIN_FRAME_PERIOD_HISTORY_LEN) {
+    std::list<double>::iterator firstItem = _tsDeltaHist.begin();
+    _tsDeltaHist.erase(firstItem);
+  }
+  std::list<double>::iterator it = _tsDeltaHist.begin();
+  for (; it != _tsDeltaHist.end(); it++) {
+    minFramePeriod = BWE_MIN(*it, minFramePeriod);
+  }
+  _tsDeltaHist.push_back(tsDelta);
+  return minFramePeriod;
 }
 
 void OverUseDetector::UpdateNoiseEstimate(double residual, double tsDelta, bool stableState)
diff --git a/src/modules/rtp_rtcp/source/overuse_detector.h b/src/modules/rtp_rtcp/source/overuse_detector.h
index 67913785a9..b250e01684 100644
--- a/src/modules/rtp_rtcp/source/overuse_detector.h
+++ b/src/modules/rtp_rtcp/source/overuse_detector.h
@@ -11,10 +11,11 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_
 
+#include <list>
+
 #include "bwe_defines.h"
 #include "module_common_types.h"
 #include "typedefs.h"
-#include "list_wrapper.h"
 
 #ifdef WEBRTC_BWE_MATLAB
 #include "../test/BWEStandAlone/MatlabPlot.h"
@@ -71,7 +72,7 @@ private:
     double _avgNoise;
     double _varNoise;
     double _threshold;
-    ListWrapper _tsDeltaHist;
+    std::list<double> _tsDeltaHist;
     double _prevOffset;
     double _timeOverUsing;
     WebRtc_UWord16 _overUseCounter;