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

Force commit of 449006'

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/455006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1939 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
niklas.enbom@webrtc.org 2012-03-26 08:11:25 +00:00
parent 38f247d800
commit 5398d9583b
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/voice_engine/main/source/channel.cc
View File

@ -918,20 +918,7 @@ WebRtc_Word32 Channel::GetAudioFrame(const WebRtc_Word32 id,
if (_outputFileRecording && _outputFileRecorderPtr)
{
if(audioFrame._audioChannel == 2)
{
AudioFrame temp = audioFrame;
AudioFrameOperations::StereoToMono (temp);
_outputFileRecorderPtr->RecordAudioToFile(temp);
}
else if(audioFrame._audioChannel == 1)
{
_outputFileRecorderPtr->RecordAudioToFile(audioFrame);
}
else
{
assert(false);
}
_outputFileRecorderPtr->RecordAudioToFile(audioFrame);
}
}
@ -3902,7 +3889,8 @@ int Channel::StartRecordingPlayout(const char* fileName,
const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
CodecInst dummyCodec={100,"L16",16000,320,1,320000};
if (codecInst != NULL && codecInst->channels != 1)
if (codecInst != NULL &&
(codecInst->channels < 1) || (codecInst->channels > 2))
{
_engineStatisticsPtr->SetLastError(
VE_BAD_ARGUMENT, kTraceError,

5
src/voice_engine/main/source/output_mixer.cc
View File

@ -342,7 +342,8 @@ int OutputMixer::StartRecordingPlayout(const char* fileName,
const WebRtc_UWord32 notificationTime(0);
CodecInst dummyCodec={100,"L16",16000,320,1,320000};
if (codecInst != NULL && codecInst->channels != 1)
if (codecInst != NULL &&
(codecInst->channels < 1) || (codecInst->channels > 2))
{
_engineStatisticsPtr->SetLastError(
VE_BAD_ARGUMENT, kTraceError,
@ -529,8 +530,6 @@ OutputMixer::GetMixedAudio(const WebRtc_Word32 desiredFreqHz,
CriticalSectionScoped cs(&_fileCritSect);
if (_outputFileRecording)
{
assert(audioFrame._audioChannel == 1);
if (_outputFileRecorderPtr)
{
_outputFileRecorderPtr->RecordAudioToFile(audioFrame);

6
src/voice_engine/main/source/voe_file_impl.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
@ -469,8 +469,8 @@ int VoEFileImpl::StartRecordingPlayout(
}
if (channel == -1)
{
_outputMixerPtr->StartRecordingPlayout(fileNameUTF8, compression);
return 0;
return _outputMixerPtr->StartRecordingPlayout
(fileNameUTF8, compression);
}
else
{