From 9ae7d44896eeb88cb5dd4a7baf805607436ce7e0 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Thu, 17 Jul 2014 22:19:21 +0000 Subject: Use _numMixedParticipants instead of audioFrameList->size() to determine if there're more than one participants. There are two audioFrameLists. The previous check wouldn't work correctly if each list had a single member. TEST=chrome https://apprtc.appspot.com/?debug=loopback&video=false and verify e2e delay stats BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/15019004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6723 4adac7df-926f-26a2-2b94-8c16560cd09d --- modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 26ef3e88..bc97ec20 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -955,7 +955,7 @@ int32_t AudioConferenceMixerImpl::MixFromList( return 0; } - if (audioFrameList->size() == 1) { + if (_numMixedParticipants == 1) { mixedAudio.timestamp_ = audioFrameList->front()->timestamp_; mixedAudio.elapsed_time_ms_ = audioFrameList->front()->elapsed_time_ms_; } else { -- cgit v1.2.3