| Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
|
| diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
|
| index 1d7602533e483765d697dd463461422beef1a50d..9411a9a47e4892e3595b8aedcfe03875799a2ddb 100644
|
| --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
|
| +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
|
| @@ -189,7 +189,7 @@
|
| return timeUntilNextProcess;
|
| }
|
|
|
| -void AudioConferenceMixerImpl::Process() {
|
| +int32_t AudioConferenceMixerImpl::Process() {
|
| size_t remainingParticipantsAllowedToMix =
|
| kMaximumAmountOfMixedParticipants;
|
| {
|
| @@ -222,7 +222,7 @@
|
| if(lowFreq <= 0) {
|
| CriticalSectionScoped cs(_crit.get());
|
| _processCalls--;
|
| - return;
|
| + return 0;
|
| } else {
|
| switch(lowFreq) {
|
| case 8000:
|
| @@ -250,7 +250,7 @@
|
|
|
| CriticalSectionScoped cs(_crit.get());
|
| _processCalls--;
|
| - return;
|
| + return -1;
|
| }
|
| }
|
|
|
| @@ -267,9 +267,10 @@
|
| WEBRTC_TRACE(kTraceMemory, kTraceAudioMixerServer, _id,
|
| "failed PopMemory() call");
|
| assert(false);
|
| - return;
|
| - }
|
| -
|
| + return -1;
|
| + }
|
| +
|
| + int retval = 0;
|
| {
|
| CriticalSectionScoped cs(_crit.get());
|
|
|
| @@ -303,7 +304,8 @@
|
| mixedAudio->Mute();
|
| } else {
|
| // Only call the limiter if we have something to mix.
|
| - LimitMixedAudio(mixedAudio);
|
| + if(!LimitMixedAudio(mixedAudio))
|
| + retval = -1;
|
| }
|
| }
|
|
|
| @@ -328,7 +330,7 @@
|
| CriticalSectionScoped cs(_crit.get());
|
| _processCalls--;
|
| }
|
| - return;
|
| + return retval;
|
| }
|
|
|
| int32_t AudioConferenceMixerImpl::RegisterMixedStreamCallback(
|
|
|