UMA log for audio_device Init and Start(Playout|Recording). Make Init return a more specific error …

webrtc/modules/audio_device/mac/audio_device_mac.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.
  */
 

[Max Morin WebRTC, 2016/06/30 11:22:58]

Added missing logging header

 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/modules/audio_device/audio_device_config.h"
 #include "webrtc/modules/audio_device/mac/audio_device_mac.h"
 #include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 #include <ApplicationServices/ApplicationServices.h>
@@ skipping 193 matching lines @@
   _ptrAudioBuffer->SetRecordingChannels(N_REC_CHANNELS);
   _ptrAudioBuffer->SetPlayoutChannels(N_PLAY_CHANNELS);
 }
 
 int32_t AudioDeviceMac::ActiveAudioLayer(
     AudioDeviceModule::AudioLayer& audioLayer) const {
   audioLayer = AudioDeviceModule::kPlatformDefaultAudio;
   return 0;
 }
 
-int32_t AudioDeviceMac::Init() {
+AudioDeviceGeneric::InitStatus AudioDeviceMac::Init() {
   CriticalSectionScoped lock(&_critSect);
 
   if (_initialized) {
-    return 0;
+    return InitStatus::OK;
   }
 
   OSStatus err = noErr;
 
   _isShutDown = false;
 
   // PortAudio ring buffers require an elementCount which is a power of two.
   if (_renderBufData == NULL) {
     UInt32 powerOfTwo = 1;
     while (powerOfTwo < PLAY_BUF_SIZE_IN_SAMPLES) {
       powerOfTwo <<= 1;
     }
     _renderBufSizeSamples = powerOfTwo;
     _renderBufData = new SInt16[_renderBufSizeSamples];
   }
 
   if (_paRenderBuffer == NULL) {
     _paRenderBuffer = new PaUtilRingBuffer;
     PaRingBufferSize bufSize = -1;
     bufSize = PaUtil_InitializeRingBuffer(
         _paRenderBuffer, sizeof(SInt16), _renderBufSizeSamples, _renderBufData);
     if (bufSize == -1) {
       WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
                    " PaUtil_InitializeRingBuffer() error");
-      return -1;
+      return InitStatus::PLAYOUT_ERROR;
     }
   }
 
   if (_captureBufData == NULL) {
     UInt32 powerOfTwo = 1;
     while (powerOfTwo < REC_BUF_SIZE_IN_SAMPLES) {
       powerOfTwo <<= 1;
     }
     _captureBufSizeSamples = powerOfTwo;
     _captureBufData = new Float32[_captureBufSizeSamples];
   }
 
   if (_paCaptureBuffer == NULL) {
     _paCaptureBuffer = new PaUtilRingBuffer;
     PaRingBufferSize bufSize = -1;
     bufSize =
         PaUtil_InitializeRingBuffer(_paCaptureBuffer, sizeof(Float32),
                                     _captureBufSizeSamples, _captureBufData);
     if (bufSize == -1) {
       WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
                    " PaUtil_InitializeRingBuffer() error");
-      return -1;
+      return InitStatus::RECORDING_ERROR;
     }
   }
 
   kern_return_t kernErr = KERN_SUCCESS;
   kernErr = semaphore_create(mach_task_self(), &_renderSemaphore,
                              SYNC_POLICY_FIFO, 0);
   if (kernErr != KERN_SUCCESS) {
     WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
                  " semaphore_create() error: %d", kernErr);
-    return -1;
+    return InitStatus::OTHER_ERROR;
   }
 
   kernErr = semaphore_create(mach_task_self(), &_captureSemaphore,
                              SYNC_POLICY_FIFO, 0);
   if (kernErr != KERN_SUCCESS) {
     WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
                  " semaphore_create() error: %d", kernErr);
-    return -1;
+    return InitStatus::OTHER_ERROR;
   }
 
   // Setting RunLoop to NULL here instructs HAL to manage its own thread for
   // notifications. This was the default behaviour on OS X 10.5 and earlier,
   // but now must be explicitly specified. HAL would otherwise try to use the
   // main thread to issue notifications.
   AudioObjectPropertyAddress propertyAddress = {
       kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal,
       kAudioObjectPropertyElementMaster};
   CFRunLoopRef runLoop = NULL;
   UInt32 size = sizeof(CFRunLoopRef);
-  WEBRTC_CA_RETURN_ON_ERR(AudioObjectSetPropertyData(
-      kAudioObjectSystemObject, &propertyAddress, 0, NULL, size, &runLoop));
+  int aoerr = AudioObjectSetPropertyData(
+      kAudioObjectSystemObject, &propertyAddress, 0, NULL, size, &runLoop);
+  if (aoerr != noErr) {
+    LOG(LS_ERROR) << "Error in AudioObjectSetPropertyData: "
+                  << (const char*)&aoerr;
+    return InitStatus::OTHER_ERROR;
+  }
 
   // Listen for any device changes.
   propertyAddress.mSelector = kAudioHardwarePropertyDevices;
   WEBRTC_CA_LOG_ERR(AudioObjectAddPropertyListener(
       kAudioObjectSystemObject, &propertyAddress, &objectListenerProc, this));
 
   // Determine if this is a MacBook Pro
   _macBookPro = false;
   _macBookProPanRight = false;
   char buf[128];
@@ skipping 14 matching lines @@
 
   _playWarning = 0;
   _playError = 0;
   _recWarning = 0;
   _recError = 0;
 
   get_mic_volume_counter_ms_ = 0;
 
   _initialized = true;
 
-  return 0;
+  return InitStatus::OK;
 }
 
 int32_t AudioDeviceMac::Terminate() {
   if (!_initialized) {
     return 0;
   }
 
   if (_recording) {
     WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
                  " Recording must be stopped");
@@ skipping 2411 matching lines @@
     bool keyState =
         CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, key_index);
     // A false -> true change in keymap means a key is pressed.
     key_down |= (keyState && !prev_key_state_[key_index]);
     // Save current state.
     prev_key_state_[key_index] = keyState;
   }
   return key_down;
 }
 }  // namespace webrtc