Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1378)

Unified Diff: webrtc/voice_engine/channel.cc

Issue 2056653002: Fix trivial lint errors in FileRecorder and FilePlayer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove5
Patch Set: Fix trivial lint errors Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/utility/source/file_recorder.cc ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 73955650e6a18f33e058b6cae5d6210ca88388bb..cb639e53bb5f66060d50b6edd89295b58869f6ca 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -1844,7 +1844,7 @@ int Channel::StartPlayingFileLocally(InStream* stream,
const uint32_t notificationTime(0);
- if (output_file_player_->StartPlayingFile(*stream, startPosition,
+ if (output_file_player_->StartPlayingFile(stream, startPosition,
volumeScaling, notificationTime,
stopPosition, codecInst) != 0) {
_engineStatisticsPtr->SetLastError(VE_BAD_FILE, kTraceError,
@@ -2034,9 +2034,9 @@ int Channel::StartPlayingFileAsMicrophone(InStream* stream,
const uint32_t notificationTime(0);
- if (input_file_player_->StartPlayingFile(*stream, startPosition,
- volumeScaling, notificationTime,
- stopPosition, codecInst) != 0) {
+ if (input_file_player_->StartPlayingFile(stream, startPosition, volumeScaling,
+ notificationTime, stopPosition,
+ codecInst) != 0) {
_engineStatisticsPtr->SetLastError(VE_BAD_FILE, kTraceError,
"StartPlayingFile() failed to start "
"file playout");
@@ -2192,7 +2192,7 @@ int Channel::StartRecordingPlayout(OutStream* stream,
return -1;
}
- if (output_file_recorder_->StartRecordingAudioFile(*stream, *codecInst,
+ if (output_file_recorder_->StartRecordingAudioFile(stream, *codecInst,
notificationTime) != 0) {
_engineStatisticsPtr->SetLastError(VE_BAD_FILE, kTraceError,
"StartRecordingPlayout() failed to "
@@ -3284,7 +3284,7 @@ int32_t Channel::MixOrReplaceAudioWithFile(int mixingFrequency) {
return -1;
}
- if (input_file_player_->Get10msAudioFromFile(fileBuffer.get(), fileSamples,
+ if (input_file_player_->Get10msAudioFromFile(fileBuffer.get(), &fileSamples,
mixingFrequency) == -1) {
WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
"Channel::MixOrReplaceAudioWithFile() file mixing "
@@ -3332,8 +3332,8 @@ int32_t Channel::MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency) {
}
// We should get the frequency we ask for.
- if (output_file_player_->Get10msAudioFromFile(fileBuffer.get(), fileSamples,
- mixingFrequency) == -1) {
+ if (output_file_player_->Get10msAudioFromFile(
+ fileBuffer.get(), &fileSamples, mixingFrequency) == -1) {
WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
"Channel::MixAudioWithFile() file mixing failed");
return -1;
« no previous file with comments | « webrtc/modules/utility/source/file_recorder.cc ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698