diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-22 04:44:30 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-22 04:44:30 +0000 |
| commit | d4682361fd4d284657e4e33ca5f022cc8ea8f468 (patch) | |
| tree | 2678d43a774482267dc1347405ec85fe427b4543 /voice_engine/voe_file_impl.cc | |
| parent | 1bb2146351979b6610107419b2a9c86cca2692a3 (diff) | |
| download | webrtc-d4682361fd4d284657e4e33ca5f022cc8ea8f468.tar.gz | |
Replace AudioFrame's operator= with CopyFrom().
Enforce DISALLOW_COPY_AND_ASSIGN to catch offenders.
Review URL: https://webrtc-codereview.appspot.com/1031007
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3395 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_file_impl.cc')
| -rw-r--r-- | voice_engine/voe_file_impl.cc | 129 |
1 files changed, 34 insertions, 95 deletions
diff --git a/voice_engine/voe_file_impl.cc b/voice_engine/voe_file_impl.cc index 8f0061fa..869cd864 100644 --- a/voice_engine/voe_file_impl.cc +++ b/voice_engine/voe_file_impl.cc @@ -704,17 +704,10 @@ int VoEFileImpl::ConvertPCMToWAV(const char* fileNameInUTF8, break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertPCMToWAV failed during conversion (audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -794,18 +787,10 @@ int VoEFileImpl::ConvertPCMToWAV(InStream* streamIn, OutStream* streamOut) break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, frequency, - AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertPCMToWAV failed during conversion " - "(create audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, frequency, + AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -882,17 +867,10 @@ int VoEFileImpl::ConvertWAVToPCM(const char* fileNameInUTF8, break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertWAVToPCM failed during conversion (audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -974,17 +952,10 @@ int VoEFileImpl::ConvertWAVToPCM(InStream* streamIn, OutStream* streamOut) break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, frequency, - AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertWAVToPCM failed during conversion (audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, frequency, + AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -1059,18 +1030,10 @@ int VoEFileImpl::ConvertPCMToCompressed(const char* fileNameInUTF8, // This is an OK way to end break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertPCMToCompressed failed during conversion " - "(audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -1151,18 +1114,10 @@ int VoEFileImpl::ConvertPCMToCompressed(InStream* streamIn, // This is an OK way to end break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertPCMToCompressed failed during conversion " - "(audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -1241,19 +1196,11 @@ int VoEFileImpl::ConvertCompressedToPCM(const char* fileNameInUTF8, // This is an OK way to end break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, - AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertCompressedToPCM failed during conversion " - "(create audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, + AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) @@ -1338,19 +1285,11 @@ int VoEFileImpl::ConvertCompressedToPCM(InStream* streamIn, // This is an OK way to end break; } - res=audioFrame.UpdateFrame(-1, 0, decodedData, - (WebRtc_UWord16)decLength, - frequency, - AudioFrame::kNormalSpeech, - AudioFrame::kVadActive); - if(res) - { - WEBRTC_TRACE(kTraceError, kTraceVoice, - VoEId(_shared->instance_id(), -1), - "ConvertCompressedToPCM failed during conversion " - "(audio frame)"); - break; - } + audioFrame.UpdateFrame(-1, 0, decodedData, + (WebRtc_UWord16)decLength, + frequency, + AudioFrame::kNormalSpeech, + AudioFrame::kVadActive); res=recObj.RecordAudioToFile(audioFrame); if(res) |