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

Unified Diff: webrtc/voice_engine/transmit_mixer.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/voice_engine/output_mixer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/transmit_mixer.cc
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
index ef446aa89269f3a29413a1b958427a98e72c3d1d..6fcc64452fb02039652696649efacaa4dcfe8aa4 100644
--- a/webrtc/voice_engine/transmit_mixer.cc
+++ b/webrtc/voice_engine/transmit_mixer.cc
@@ -568,9 +568,9 @@ int TransmitMixer::StartPlayingFileAsMicrophone(InStream* stream,
const uint32_t notificationTime(0);
- if (file_player_->StartPlayingFile(
- (InStream&)*stream, startPosition, volumeScaling, notificationTime,
- stopPosition, (const CodecInst*)codecInst) != 0) {
+ if (file_player_->StartPlayingFile(stream, startPosition, volumeScaling,
+ notificationTime, stopPosition,
+ (const CodecInst*)codecInst) != 0) {
_engineStatisticsPtr->SetLastError(
VE_BAD_FILE, kTraceError,
"StartPlayingFile() failed to start file playout");
@@ -743,7 +743,7 @@ int TransmitMixer::StartRecordingMicrophone(OutStream* stream,
return -1;
}
- if (file_recorder_->StartRecordingAudioFile(*stream, *codecInst,
+ if (file_recorder_->StartRecordingAudioFile(stream, *codecInst,
notificationTime) != 0) {
_engineStatisticsPtr->SetLastError(
VE_BAD_FILE, kTraceError,
@@ -912,7 +912,7 @@ int TransmitMixer::StartRecordingCall(OutStream* stream,
return -1;
}
- if (file_call_recorder_->StartRecordingAudioFile(*stream, *codecInst,
+ if (file_call_recorder_->StartRecordingAudioFile(stream, *codecInst,
notificationTime) != 0) {
_engineStatisticsPtr->SetLastError(
VE_BAD_FILE, kTraceError,
@@ -1096,7 +1096,7 @@ int32_t TransmitMixer::MixOrReplaceAudioWithFile(
return -1;
}
- if (file_player_->Get10msAudioFromFile(fileBuffer.get(), fileSamples,
+ if (file_player_->Get10msAudioFromFile(fileBuffer.get(), &fileSamples,
mixingFrequency) == -1) {
WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1),
"TransmitMixer::MixOrReplaceAudioWithFile() file"
« no previous file with comments | « webrtc/voice_engine/output_mixer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698