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

Changed to use std::sort

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1488 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org
2012-01-20 01:39:13 +00:00
parent f33dfa89b9
commit 9165f1fe91
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -20,7 +20,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk

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

@@ -479,7 +479,7 @@ ACMNetEQ::NetworkStatistics(
{ {
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()); std::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 % 2 == 0) if (size % 2 == 0)