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; |