zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed list wrapper fromr overuse detector.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/353004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1477 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pwestin@webrtc.org
2012-01-19 15:55:54 +00:00
parent d4adc5b26f
commit 3c9be1bc4d
2 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/rtp_rtcp/source/overuse_detector.cc
View File

@ -85,12 +85,8 @@ OverUseDetector::~OverUseDetector()
_plot4 = NULL; _plot4 = NULL;
} }
#endif #endif
while (!_tsDeltaHist.Empty())
{ _tsDeltaHist.clear();
ListItem* item = _tsDeltaHist.First();
delete static_cast<double*>(item->GetItem());
_tsDeltaHist.Erase(item);
}
} }
void OverUseDetector::Reset() void OverUseDetector::Reset()
@ -117,12 +113,7 @@ void OverUseDetector::Reset()
_timeOverUsing = -1; _timeOverUsing = -1;
_overUseCounter = 0; _overUseCounter = 0;
_hypothesis = kBwNormal; _hypothesis = kBwNormal;
while (!_tsDeltaHist.Empty()) _tsDeltaHist.clear();
{
ListItem* item = _tsDeltaHist.First();
delete static_cast<double*>(item->GetItem());
_tsDeltaHist.Erase(item);
}
} }
bool OverUseDetector::Update(const WebRtcRTPHeader& rtpHeader, bool OverUseDetector::Update(const WebRtcRTPHeader& rtpHeader,
@ -349,23 +340,17 @@ void OverUseDetector::UpdateKalman(WebRtc_Word64 tDelta, double tsDelta, WebRtc_
#endif #endif
} }
double OverUseDetector::UpdateMinFramePeriod(double tsDelta) double OverUseDetector::UpdateMinFramePeriod(double tsDelta) {
{
double minFramePeriod = tsDelta; double minFramePeriod = tsDelta;
if (_tsDeltaHist.GetSize() >= MIN_FRAME_PERIOD_HISTORY_LEN) if (_tsDeltaHist.size() >= MIN_FRAME_PERIOD_HISTORY_LEN) {
{ std::list<double>::iterator firstItem = _tsDeltaHist.begin();
ListItem* firstItem = _tsDeltaHist.First(); _tsDeltaHist.erase(firstItem);
delete static_cast<double*>(firstItem->GetItem());
_tsDeltaHist.Erase(firstItem);
} }
for (ListItem* item = _tsDeltaHist.First(); std::list<double>::iterator it = _tsDeltaHist.begin();
item != NULL; for (; it != _tsDeltaHist.end(); it++) {
item = _tsDeltaHist.Next(item)) minFramePeriod = BWE_MIN(*it, minFramePeriod);
{
const double* histDelta = static_cast<double*>(item->GetItem());
minFramePeriod = BWE_MIN(*histDelta, minFramePeriod);
} }
_tsDeltaHist.PushBack(new double(tsDelta)); _tsDeltaHist.push_back(tsDelta);
return minFramePeriod; return minFramePeriod;
} }

5
src/modules/rtp_rtcp/source/overuse_detector.h
View File

@ -11,10 +11,11 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_OVERUSE_DETECTOR_H_
#include <list>
#include "bwe_defines.h" #include "bwe_defines.h"
#include "module_common_types.h" #include "module_common_types.h"
#include "typedefs.h" #include "typedefs.h"
#include "list_wrapper.h"
#ifdef WEBRTC_BWE_MATLAB #ifdef WEBRTC_BWE_MATLAB
#include "../test/BWEStandAlone/MatlabPlot.h" #include "../test/BWEStandAlone/MatlabPlot.h"
@ -71,7 +72,7 @@ private:
double _avgNoise; double _avgNoise;
double _varNoise; double _varNoise;
double _threshold; double _threshold;
ListWrapper _tsDeltaHist; std::list<double> _tsDeltaHist;
double _prevOffset; double _prevOffset;
double _timeOverUsing; double _timeOverUsing;
WebRtc_UWord16 _overUseCounter; WebRtc_UWord16 _overUseCounter;