FileRecorder + FilePlayer: Let Create functions return unique_ptr

webrtc/voice_engine/output_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 81 matching lines @@
 
 OutputMixer::OutputMixer(uint32_t instanceId) :
     _mixerModule(*AudioConferenceMixer::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),
                  "OutputMixer::OutputMixer() - ctor");
 
     if (_mixerModule.RegisterMixedStreamCallback(this) == -1)
     {
         WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId,-1),
                      "OutputMixer::OutputMixer() failed to register mixer"
                      "callbacks");
@@ skipping 13 matching lines @@
 OutputMixer::~OutputMixer()
 {
     WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::~OutputMixer() - dtor");
     if (_externalMedia)
     {
         DeRegisterExternalMediaProcessing();
     }
     {
         rtc::CritScope cs(&_fileCritSect);
-        if (_outputFileRecorderPtr)
-        {
-            _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-            _outputFileRecorderPtr->StopRecording();
-            FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-            _outputFileRecorderPtr = NULL;
+        if (output_file_recorder_) {
+          output_file_recorder_->RegisterModuleFileCallback(NULL);
+          output_file_recorder_->StopRecording();
         }
     }
     _mixerModule.UnRegisterMixedStreamCallback();
     delete &_mixerModule;
 }
 
 int32_t
 OutputMixer::SetEngineInformation(voe::Statistics& engineStatistics)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
@@ skipping 136 matching lines @@
         format = kFileFormatWavFile;
     }
     else
     {
         format = kFileFormatCompressedFile;
     }
 
     rtc::CritScope cs(&_fileCritSect);
 
     // Destroy the old instance
-    if (_outputFileRecorderPtr)
-    {
-        _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-        FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-        _outputFileRecorderPtr = NULL;
+    if (output_file_recorder_) {
+      output_file_recorder_->RegisterModuleFileCallback(NULL);
+      output_file_recorder_.reset();
     }
 
-    _outputFileRecorderPtr = FileRecorder::CreateFileRecorder(
-        _instanceId,
-        (const FileFormats)format);
-    if (_outputFileRecorderPtr == NULL)
-    {
-        _engineStatisticsPtr->SetLastError(
-            VE_INVALID_ARGUMENT, kTraceError,
-            "StartRecordingPlayout() fileRecorder format isnot correct");
-        return -1;
+    output_file_recorder_ = FileRecorder::CreateFileRecorder(
+        _instanceId, (const FileFormats)format);
+    if (!output_file_recorder_) {
+      _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;
-        return -1;
+    if (output_file_recorder_->StartRecordingAudioFile(
+            fileName, (const CodecInst&)*codecInst, notificationTime) != 0) {
+      _engineStatisticsPtr->SetLastError(
+          VE_BAD_FILE, kTraceError,
+          "StartRecordingAudioFile() failed to start file recording");
+      output_file_recorder_->StopRecording();
+      output_file_recorder_.reset();
+      return -1;
     }
-    _outputFileRecorderPtr->RegisterModuleFileCallback(this);
+    output_file_recorder_->RegisterModuleFileCallback(this);
     _outputFileRecording = true;
 
     return 0;
 }
 
 int OutputMixer::StartRecordingPlayout(OutStream* stream,
                                        const CodecInst* codecInst)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::StartRecordingPlayout()");
@@ skipping 28 matching lines @@
         format = kFileFormatWavFile;
     }
     else
     {
         format = kFileFormatCompressedFile;
     }
 
     rtc::CritScope cs(&_fileCritSect);
 
     // Destroy the old instance
-    if (_outputFileRecorderPtr)
-    {
-        _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-        FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-        _outputFileRecorderPtr = NULL;
+    if (output_file_recorder_) {
+      output_file_recorder_->RegisterModuleFileCallback(NULL);
+      output_file_recorder_.reset();
     }
 
-    _outputFileRecorderPtr = FileRecorder::CreateFileRecorder(
-        _instanceId,
-        (const FileFormats)format);
-    if (_outputFileRecorderPtr == NULL)
-    {
-        _engineStatisticsPtr->SetLastError(
-            VE_INVALID_ARGUMENT, kTraceError,
-            "StartRecordingPlayout() fileRecorder format isnot correct");
-        return -1;
+    output_file_recorder_ = FileRecorder::CreateFileRecorder(
+        _instanceId, (const FileFormats)format);
+    if (!output_file_recorder_) {
+      _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;
-        return -1;
+    if (output_file_recorder_->StartRecordingAudioFile(*stream, *codecInst,
+                                                       notificationTime) != 0) {
+      _engineStatisticsPtr->SetLastError(
+          VE_BAD_FILE, kTraceError,
+          "StartRecordingAudioFile() failed to start file recording");
+      output_file_recorder_->StopRecording();
+      output_file_recorder_.reset();
+      return -1;
     }
 
-    _outputFileRecorderPtr->RegisterModuleFileCallback(this);
+    output_file_recorder_->RegisterModuleFileCallback(this);
     _outputFileRecording = true;
 
     return 0;
 }
 
 int OutputMixer::StopRecordingPlayout()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::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;
+    if (output_file_recorder_->StopRecording() != 0) {
+      _engineStatisticsPtr->SetLastError(
+          VE_STOP_RECORDING_FAILED, kTraceError,
+          "StopRecording(), could not stop recording");
+      return -1;
     }
-    _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
-    FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
-    _outputFileRecorderPtr = NULL;
+    output_file_recorder_->RegisterModuleFileCallback(NULL);
+    output_file_recorder_.reset();
     _outputFileRecording = false;
 
     return 0;
 }
 
 int OutputMixer::GetMixedAudio(int sample_rate_hz,
                                size_t num_channels,
                                AudioFrame* frame) {
   WEBRTC_TRACE(
       kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
       "OutputMixer::GetMixedAudio(sample_rate_hz=%d, num_channels=%" PRIuS ")",
       sample_rate_hz, num_channels);
 
   // --- Record playout if enabled
   {
     rtc::CritScope cs(&_fileCritSect);
-    if (_outputFileRecording && _outputFileRecorderPtr)
-      _outputFileRecorderPtr->RecordAudioToFile(_audioFrame);
+    if (_outputFileRecording && output_file_recorder_)
+      output_file_recorder_->RecordAudioToFile(_audioFrame);
   }
 
   frame->num_channels_ = num_channels;
   frame->sample_rate_hz_ = sample_rate_hz;
   // TODO(andrew): Ideally the downmixing would occur much earlier, in
   // AudioCodingModule.
   RemixAndResample(_audioFrame, &resampler_, frame);
   return 0;
 }
 
@@ skipping 52 matching lines @@
         }
     }
 
     // --- Measure audio level (0-9) for the combined signal
     _audioLevel.ComputeLevel(_audioFrame);
 
     return 0;
 }
 }  // namespace voe
 }  // namespace webrtc