| Index: webrtc/voice_engine/transmit_mixer.cc
|
| diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
|
| index 6796f8457c5e5b3060920c6be9995b8f739612b2..b044367de7ecc50dc4f768b3bd9e3b46a09fd77d 100644
|
| --- a/webrtc/voice_engine/transmit_mixer.cc
|
| +++ b/webrtc/voice_engine/transmit_mixer.cc
|
| @@ -247,9 +247,14 @@ void TransmitMixer::GetSendCodecInfo(int* max_sample_rate,
|
| Channel* channel = it.GetChannel();
|
| if (channel->Sending()) {
|
| CodecInst codec;
|
| - channel->GetSendCodec(codec);
|
| - *max_sample_rate = std::max(*max_sample_rate, codec.plfreq);
|
| - *max_channels = std::max(*max_channels, codec.channels);
|
| + if (channel->GetSendCodec(codec) == 0) {
|
| + *max_sample_rate = std::max(*max_sample_rate, codec.plfreq);
|
| + *max_channels = std::max(*max_channels, codec.channels);
|
| + } else {
|
| + LOG(LS_WARNING) << "Unable to get send codec for channel "
|
| + << channel->ChannelId();
|
| + RTC_NOTREACHED();
|
| + }
|
| }
|
| }
|
| }
|
|
|