generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue 218 with new solution

Browse Source 
This one is slightly more elegant and efficient.

BUG=http://code.google.com/p/webrtc/issues/detail?id=218
TEST=

Review URL: http://webrtc-codereview.appspot.com/344009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1420 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2012-01-13 07:46:50 +00:00
parent 7859e10985
commit 33d5f69d5e
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/modules/audio_coding/main/source/acm_neteq.cc
View File

@ -475,40 +475,37 @@ ACMNetEQ::NetworkStatistics(
int waiting_times[kArrayLen]; int waiting_times[kArrayLen];
int waiting_times_len = WebRtcNetEQ_GetRawFrameWaitingTimes( int waiting_times_len = WebRtcNetEQ_GetRawFrameWaitingTimes(
_inst[0], kArrayLen, waiting_times); _inst[0], kArrayLen, waiting_times);
if (waiting_times_len >= 0) if (waiting_times_len > 0)
{ {
std::vector<int> waiting_times_vec(waiting_times, std::vector<int> waiting_times_vec(waiting_times,
waiting_times + waiting_times_len); waiting_times + waiting_times_len);
sort(waiting_times_vec.begin(), waiting_times_vec.end()); sort(waiting_times_vec.begin(), waiting_times_vec.end());
size_t size = waiting_times_vec.size(); size_t size = waiting_times_vec.size();
assert(size == static_cast<size_t>(waiting_times_len)); assert(size == static_cast<size_t>(waiting_times_len));
if (size == 0) if (size % 2 == 0)
{ {
statistics->meanWaitingTimeMs = -1; statistics->medianWaitingTimeMs =
statistics->medianWaitingTimeMs = -1; (waiting_times_vec[size / 2 - 1] +
statistics->minWaitingTimeMs = -1; waiting_times_vec[size / 2]) / 2;
statistics->maxWaitingTimeMs = -1;
} }
else else
{ {
if (size % 2 == 0) statistics->medianWaitingTimeMs = waiting_times_vec[size / 2];
{
statistics->medianWaitingTimeMs =
(waiting_times_vec[size / 2 - 1] +
waiting_times_vec[size / 2]) / 2;
}
else
{
statistics->medianWaitingTimeMs = waiting_times_vec[size / 2];
}
statistics->minWaitingTimeMs = waiting_times_vec.front();
statistics->maxWaitingTimeMs = waiting_times_vec.back();
double sum = 0;
for (size_t i = 0; i < size; ++i) {
sum += waiting_times_vec[i];
}
statistics->meanWaitingTimeMs = static_cast<int>(sum / size);
} }
statistics->minWaitingTimeMs = waiting_times_vec.front();
statistics->maxWaitingTimeMs = waiting_times_vec.back();
double sum = 0;
for (size_t i = 0; i < size; ++i) {
sum += waiting_times_vec[i];
}
statistics->meanWaitingTimeMs = static_cast<int>(sum / size);
}
else if (waiting_times_len == 0)
{
statistics->meanWaitingTimeMs = -1;
statistics->medianWaitingTimeMs = -1;
statistics->minWaitingTimeMs = -1;
statistics->maxWaitingTimeMs = -1;
} }
else else
{ {