zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is to re-open an earlier CL

Browse Source 
https://webrtc-codereview.appspot.com/16619005/

which is reverted due to an issue in audio conference mixer.

This issue has been solved in
https://webrtc-codereview.appspot.com/20779004/

BUG=webrtc:3155
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18819005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6736 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
minyue@webrtc.org
2014-07-18 21:11:27 +00:00
parent 60e65b11c1
commit f563e85ab0
12 changed files with 249 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
View File

@ -1618,14 +1618,8 @@ int AudioCodingModuleImpl::ReceiveFrequency() const {
int codec_id = receiver_.last_audio_codec_id();
int sample_rate_hz;
if (codec_id < 0)
sample_rate_hz = receiver_.current_sample_rate_hz();
else
sample_rate_hz = ACMCodecDB::database_[codec_id].plfreq;
// TODO(tlegrand): Remove this option when we have full 48 kHz support.
return (sample_rate_hz > 32000) ? 32000 : sample_rate_hz;
return codec_id < 0 ? receiver_.current_sample_rate_hz() :
ACMCodecDB::database_[codec_id].plfreq;
}
// Get current playout frequency.