diff options
| author | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-18 12:28:28 +0000 |
|---|---|---|
| committer | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-18 12:28:28 +0000 |
| commit | d89fa97356bc1a276fd1319f3b57232f2e8cdc01 (patch) | |
| tree | 175828d54d726861a29f80ec9c0fdfde3e93efe4 /modules/audio_conference_mixer/source/audio_conference_mixer_impl.h | |
| parent | c6176548bfae24bcd7ff110d13a7e5139ef6bdb9 (diff) | |
| download | webrtc-d89fa97356bc1a276fd1319f3b57232f2e8cdc01.tar.gz | |
This is related to an earlier CL of enabling Opus 48 kHz.
https://webrtc-codereview.appspot.com/16619005/
It was reverted due to a build bot error, which this CL is to fix. The problem was that when audio conference mixer receives audio frames all at 48 kHz and mixed them, it uses Audio Processing Module (APM) to do a post-processing. However the APM cannot handle 48 kHz input. The current solution is not to allow the mixer to output 48 kHz.
TEST=locally solved https://webrtc-codereview.appspot.com/16619005/
BUG=
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20779004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6730 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/audio_conference_mixer/source/audio_conference_mixer_impl.h')
| -rw-r--r-- | modules/audio_conference_mixer/source/audio_conference_mixer_impl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index 31dc71e5..44f4ff04 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -192,6 +192,9 @@ private: MixerParticipantList _additionalParticipantList; size_t _numMixedParticipants; + // Determines if we will use a limiter for clipping protection during + // mixing. + bool use_limiter_; uint32_t _timeStamp; |