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

Only reset AudioProcessing if number of channels has changed.

Browse Source 
Calling SetSendCodec() would always reset AudioProcessing.

BUG=
TEST=voe_auto_test

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1799 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-02-29 17:00:56 +00:00
parent 07c68b9c9d
commit 0e28566247
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/voice_engine/main/source/voe_codec_impl.cc
View File

@ -193,13 +193,20 @@ int VoECodecImpl::SetSendCodec(int channel, const CodecInst& codec)
// This will happen with a stereo codec and a device which doesn't support
// stereo. AudioCoding should probably do the faking; look into how to
// handle this case properly.
if (_audioProcessingModulePtr->set_num_channels(
_audioProcessingModulePtr->num_input_channels(),
maxNumChannels) != 0)
//
// Check if the number of channels has changed to avoid an unnecessary
// reset.
// TODO(andrew): look at handling this logic in AudioProcessing.
if (_audioProcessingModulePtr->num_output_channels() != maxNumChannels)
{
_engineStatistics.SetLastError(VE_SOUNDCARD_ERROR, kTraceError,
"Init() failed to set APM channels for the send audio stream");
return -1;
if (_audioProcessingModulePtr->set_num_channels(
_audioProcessingModulePtr->num_input_channels(),
maxNumChannels) != 0)
{
_engineStatistics.SetLastError(VE_SOUNDCARD_ERROR, kTraceError,
"Init() failed to set APM channels for the send audio stream");
return -1;
}
}
return 0;