| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 0965963fdd72ab87dd532b24ffca65cbcf8bad7e..44c8da4dde5b88ec7d4635d22bfabf561c63ed09 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -739,6 +739,28 @@ MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
|
| : MixerParticipant::AudioFrameInfo::kNormal;
|
| }
|
|
|
| +AudioMixer::Source::AudioFrameWithInfo Channel::GetAudioFrameWithInfo(
|
| + int sample_rate_hz) {
|
| + mix_audio_frame_.sample_rate_hz_ = sample_rate_hz;
|
| +
|
| + const auto frame_info = GetAudioFrameWithMuted(-1, &mix_audio_frame_);
|
| +
|
| + using FrameInfo = AudioMixer::Source::AudioFrameInfo;
|
| + FrameInfo new_audio_frame_info = FrameInfo::kError;
|
| + switch (frame_info) {
|
| + case MixerParticipant::AudioFrameInfo::kNormal:
|
| + new_audio_frame_info = FrameInfo::kNormal;
|
| + break;
|
| + case MixerParticipant::AudioFrameInfo::kMuted:
|
| + new_audio_frame_info = FrameInfo::kMuted;
|
| + break;
|
| + case MixerParticipant::AudioFrameInfo::kError:
|
| + new_audio_frame_info = FrameInfo::kError;
|
| + break;
|
| + }
|
| + return {&mix_audio_frame_, new_audio_frame_info};
|
| +}
|
| +
|
| int32_t Channel::NeededFrequency(int32_t id) const {
|
| WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, _channelId),
|
| "Channel::NeededFrequency(id=%d)", id);
|
|
|