Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 901633 - Part 11 - Add an API in webrtc.org's output mixer to get the output channel count. r=jesup

Browse Source 
--HG--
extra : rebase_source : 15ca543bb0a7f3a0b79ab10531613cee605b3e7b
This commit is contained in:
Paul Adenot 2015-09-01 14:25:48 +02:00
parent db0807f658
commit c0fd8df08b
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/webrtc/trunk/webrtc/voice_engine/output_mixer.cc
View File

@ -297,6 +297,11 @@ OutputMixer::GetOutputVolumePan(float& left, float& right)
return 0;
}
int OutputMixer::GetOutputChannelCount()
{
return _audioFrame.num_channels_;
}
int OutputMixer::StartRecordingPlayout(const char* fileName,
const CodecInst* codecInst)
{

2
media/webrtc/trunk/webrtc/voice_engine/output_mixer.h
View File

@ -117,6 +117,8 @@ public:
// so ExternalPlayoutData() can insert far-end audio from the audio drivers
void APMAnalyzeReverseStream(AudioFrame &audioFrame);
int GetOutputChannelCount();
private:
OutputMixer(uint32_t instanceId);
int InsertInbandDtmfTone();

13
media/webrtc/trunk/webrtc/voice_engine/voe_external_media_impl.cc
View File

@ -383,16 +383,23 @@ int VoEExternalMediaImpl::ExternalPlayoutGetData(
AudioFrame audioFrame;
uint32_t channels = shared_->output_mixer()->GetOutputChannelCount();
// If we have not received any data yet, consider it's mono since it's the
// most common case.
if (channels == 0) {
channels = 1;
}
// Retrieve mixed output at the specified rate
shared_->output_mixer()->MixActiveChannels();
shared_->output_mixer()->DoOperationsOnCombinedSignal(true);
shared_->output_mixer()->GetMixedAudio(samplingFreqHz, 1, &audioFrame);
shared_->output_mixer()->GetMixedAudio(samplingFreqHz, channels, &audioFrame);
// Deliver audio (PCM) samples to the external sink
memcpy(speechData10ms,
audioFrame.data_,
sizeof(int16_t)*(audioFrame.samples_per_channel_));
lengthSamples = audioFrame.samples_per_channel_;
sizeof(int16_t)*audioFrame.samples_per_channel_*channels);
lengthSamples = audioFrame.samples_per_channel_ * channels;
// Store current playout delay (to be used by ExternalRecordingInsertData).
playout_delay_ms_ = current_delay_ms;