FileRecorder + FilePlayer: Let Create functions return unique_ptr

webrtc/modules/audio_mixer/audio_mixer.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 60 matching lines @@
 
 AudioMixer::AudioMixer(uint32_t instanceId)
     : _mixerModule(*NewAudioConferenceMixer::Create(instanceId)),
       _audioLevel(),
       _instanceId(instanceId),
       _externalMediaCallbackPtr(NULL),
       _externalMedia(false),
       _panLeft(1.0f),
       _panRight(1.0f),
       _mixingFrequencyHz(8000),
-      _outputFileRecorderPtr(NULL),
       _outputFileRecording(false) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::AudioMixer() - ctor");
 }
 
 void AudioMixer::Destroy(AudioMixer*& mixer) {
   if (mixer) {
     delete mixer;
     mixer = NULL;
   }
 }
 
 AudioMixer::~AudioMixer() {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::~AudioMixer() - dtor");
   if (_externalMedia) {
     DeRegisterExternalMediaProcessing();
   }
   {
     rtc::CritScope cs(&_fileCritSect);
     if (_outputFileRecorderPtr) {
       _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
       _outputFileRecorderPtr->StopRecording();
-      FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-      _outputFileRecorderPtr = NULL;
     }
   }
   delete &_mixerModule;
 }
 
 int32_t AudioMixer::SetEngineInformation(voe::Statistics& engineStatistics) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::SetEngineInformation()");
   _engineStatisticsPtr = &engineStatistics;
   return 0;
@@ skipping 102 matching lines @@
   } else if ((STR_CASE_CMP(codecInst->plname, "L16") == 0) ||
              (STR_CASE_CMP(codecInst->plname, "PCMU") == 0) ||
              (STR_CASE_CMP(codecInst->plname, "PCMA") == 0)) {
     format = kFileFormatWavFile;
   } else {
     format = kFileFormatCompressedFile;
   }
 
   rtc::CritScope cs(&_fileCritSect);
 
-  // Destroy the old instance
   if (_outputFileRecorderPtr) {
     _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-    FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-    _outputFileRecorderPtr = NULL;
   }
 
   _outputFileRecorderPtr =
       FileRecorder::CreateFileRecorder(_instanceId, (const FileFormats)format);
   if (_outputFileRecorderPtr == NULL) {
     _engineStatisticsPtr->SetLastError(
         VE_INVALID_ARGUMENT, kTraceError,
         "StartRecordingPlayout() fileRecorder format isnot correct");
     return -1;
   }
 
   if (_outputFileRecorderPtr->StartRecordingAudioFile(
           fileName, (const CodecInst&)*codecInst, notificationTime) != 0) {
     _engineStatisticsPtr->SetLastError(
         VE_BAD_FILE, kTraceError,
         "StartRecordingAudioFile() failed to start file recording");
     _outputFileRecorderPtr->StopRecording();
-    FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-    _outputFileRecorderPtr = NULL;
+    _outputFileRecorderPtr.reset();
     return -1;
   }
   _outputFileRecorderPtr->RegisterModuleFileCallback(this);
   _outputFileRecording = true;
 
   return 0;
 }
 
 int AudioMixer::StartRecordingPlayout(OutStream* stream,
                                       const CodecInst* codecInst) {
@@ skipping 22 matching lines @@
   } else if ((STR_CASE_CMP(codecInst->plname, "L16") == 0) ||
              (STR_CASE_CMP(codecInst->plname, "PCMU") == 0) ||
              (STR_CASE_CMP(codecInst->plname, "PCMA") == 0)) {
     format = kFileFormatWavFile;
   } else {
     format = kFileFormatCompressedFile;
   }
 
   rtc::CritScope cs(&_fileCritSect);
 
-  // Destroy the old instance
   if (_outputFileRecorderPtr) {
     _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-    FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-    _outputFileRecorderPtr = NULL;
   }
 
   _outputFileRecorderPtr =
       FileRecorder::CreateFileRecorder(_instanceId, (const FileFormats)format);
   if (_outputFileRecorderPtr == NULL) {
     _engineStatisticsPtr->SetLastError(
         VE_INVALID_ARGUMENT, kTraceError,
         "StartRecordingPlayout() fileRecorder format isnot correct");
     return -1;
   }
 
   if (_outputFileRecorderPtr->StartRecordingAudioFile(*stream, *codecInst,
                                                       notificationTime) != 0) {
     _engineStatisticsPtr->SetLastError(
         VE_BAD_FILE, kTraceError,
         "StartRecordingAudioFile() failed to start file recording");
     _outputFileRecorderPtr->StopRecording();
-    FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-    _outputFileRecorderPtr = NULL;
+    _outputFileRecorderPtr.reset();
     return -1;
   }
 
   _outputFileRecorderPtr->RegisterModuleFileCallback(this);
   _outputFileRecording = true;
 
   return 0;
 }
 
 int AudioMixer::StopRecordingPlayout() {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::StopRecordingPlayout()");
 
   if (!_outputFileRecording) {
     WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, -1),
                  "StopRecordingPlayout() file isnot recording");
     return -1;
   }
 
   rtc::CritScope cs(&_fileCritSect);
 
   if (_outputFileRecorderPtr->StopRecording() != 0) {
     _engineStatisticsPtr->SetLastError(
         VE_STOP_RECORDING_FAILED, kTraceError,
         "StopRecording(), could not stop recording");
     return -1;
   }
   _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-  FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-  _outputFileRecorderPtr = NULL;
+  _outputFileRecorderPtr.reset();
   _outputFileRecording = false;
 
   return 0;
 }
 
 int AudioMixer::GetMixedAudio(int sample_rate_hz,
                               size_t num_channels,
                               AudioFrame* frame) {
   WEBRTC_TRACE(
       kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
@@ skipping 57 matching lines @@
     }
   }
 
   // --- Measure audio level (0-9) for the combined signal
   _audioLevel.ComputeLevel(_audioFrame);
 
   return 0;
 }
 }  // namespace voe
 }  // namespace webrtc