Fix trivial lint errors in FileRecorder and FilePlayer

webrtc/voice_engine/channel.cc

 /*
  *  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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1826 matching lines @@
 
     if (!output_file_player_) {
       _engineStatisticsPtr->SetLastError(
           VE_INVALID_ARGUMENT, kTraceError,
           "StartPlayingFileLocally() filePlayer format isnot correct");
       return -1;
     }
 
     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,
                                          "StartPlayingFile() failed to "
                                          "start file playout");
       output_file_player_->StopPlayingFile();
       output_file_player_.reset();
       return -1;
     }
     output_file_player_->RegisterModuleFileCallback(this);
@@ skipping 169 matching lines @@
 
   if (!input_file_player_) {
     _engineStatisticsPtr->SetLastError(
         VE_INVALID_ARGUMENT, kTraceError,
         "StartPlayingInputFile() filePlayer format isnot correct");
     return -1;
   }
 
   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");
     input_file_player_->StopPlayingFile();
     input_file_player_.reset();
     return -1;
   }
 
   input_file_player_->RegisterModuleFileCallback(this);
   channel_state_.SetInputFilePlaying(true);
@@ skipping 135 matching lines @@
 
   output_file_recorder_ = FileRecorder::CreateFileRecorder(
       _outputFileRecorderId, (const FileFormats)format);
   if (!output_file_recorder_) {
     _engineStatisticsPtr->SetLastError(
         VE_INVALID_ARGUMENT, kTraceError,
         "StartRecordingPlayout() fileRecorder format isnot correct");
     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 "
                                        "start file recording");
     output_file_recorder_->StopRecording();
     output_file_recorder_.reset();
     return -1;
   }
 
   output_file_recorder_->RegisterModuleFileCallback(this);
@@ skipping 1071 matching lines @@
   {
     rtc::CritScope cs(&_fileCritSect);
 
     if (!input_file_player_) {
       WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
                    "Channel::MixOrReplaceAudioWithFile() fileplayer"
                    " doesnt exist");
       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 "
                    "failed");
       return -1;
     }
     if (fileSamples == 0) {
       WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
                    "Channel::MixOrReplaceAudioWithFile() file is ended");
       return 0;
@@ skipping 27 matching lines @@
   {
     rtc::CritScope cs(&_fileCritSect);
 
     if (!output_file_player_) {
       WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
                    "Channel::MixAudioWithFile() file mixing failed");
       return -1;
     }
 
     // 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;
     }
   }
 
   if (audioFrame.samples_per_channel_ == fileSamples) {
     // Currently file stream is always mono.
     // TODO(xians): Change the code when FilePlayer supports real stereo.
     MixWithSat(audioFrame.data_, audioFrame.num_channels_, fileBuffer.get(), 1,
@@ skipping 219 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc