Adds thread safety annotations to the AudioDeviceBuffer class

webrtc/modules/audio_device/test/audio_device_test_api.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 615 matching lines @@
   // kDefaultCommunicationDevice
   EXPECT_TRUE(audio_device_->SetPlayoutDevice(
           AudioDeviceModule::kDefaultCommunicationDevice) == 0);
   EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
   if (available)
   {
     EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
     EXPECT_EQ(0, audio_device_->InitPlayout());
     EXPECT_EQ(0, audio_device_->StartPlayout());
     EXPECT_TRUE(audio_device_->Playing());
-    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+    EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
     EXPECT_EQ(0, audio_device_->StopPlayout());
     EXPECT_FALSE(audio_device_->Playing());
     EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
   }
 #endif
 
   // repeat test but for kDefaultDevice
   EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE));
   EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
   if (available) {
     EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
     EXPECT_EQ(0, audio_device_->InitPlayout());
     EXPECT_EQ(0, audio_device_->StartPlayout());
     EXPECT_TRUE(audio_device_->Playing());
-    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+    EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
     EXPECT_EQ(0, audio_device_->StopPlayout());
     EXPECT_FALSE(audio_device_->Playing());
+    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
   }
 
   // repeat test for all devices
   int16_t no_devices = audio_device_->PlayoutDevices();
   for (int i = 0; i < no_devices; i++) {
     EXPECT_EQ(0, audio_device_->SetPlayoutDevice(i));
     EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
     if (available) {
       EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
       EXPECT_EQ(0, audio_device_->InitPlayout());
       EXPECT_EQ(0, audio_device_->StartPlayout());
       EXPECT_TRUE(audio_device_->Playing());
-      EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+      EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
       EXPECT_EQ(0, audio_device_->StopPlayout());
       EXPECT_FALSE(audio_device_->Playing());
+      EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
     }
   }
 }
 
 TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
   bool available;
   EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
 
   CheckInitialRecordingStates();
 
   EXPECT_EQ(-1, audio_device_->StartRecording());
   EXPECT_EQ(0, audio_device_->StopRecording());
 
 #ifdef _WIN32
   // kDefaultCommunicationDevice
   EXPECT_TRUE(audio_device_->SetRecordingDevice(
           AudioDeviceModule::kDefaultCommunicationDevice) == 0);
   EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
   if (available)
   {
     EXPECT_FALSE(audio_device_->RecordingIsInitialized());
     EXPECT_EQ(0, audio_device_->InitRecording());
     EXPECT_EQ(0, audio_device_->StartRecording());
     EXPECT_TRUE(audio_device_->Recording());
-    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+    EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
     EXPECT_EQ(0, audio_device_->StopRecording());
     EXPECT_FALSE(audio_device_->Recording());
     EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
   }
 #endif
 
   // repeat test but for kDefaultDevice
   EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE));
   EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
   if (available) {
     EXPECT_FALSE(audio_device_->RecordingIsInitialized());
     EXPECT_EQ(0, audio_device_->InitRecording());
     EXPECT_EQ(0, audio_device_->StartRecording());
     EXPECT_TRUE(audio_device_->Recording());
-    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+    EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
     EXPECT_EQ(0, audio_device_->StopRecording());
     EXPECT_FALSE(audio_device_->Recording());
+    EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
   }
 
   // repeat test for all devices
   int16_t no_devices = audio_device_->RecordingDevices();
   for (int i = 0; i < no_devices; i++) {
     EXPECT_EQ(0, audio_device_->SetRecordingDevice(i));
     EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
     if (available) {
       EXPECT_FALSE(audio_device_->RecordingIsInitialized());
       EXPECT_EQ(0, audio_device_->InitRecording());
       EXPECT_EQ(0, audio_device_->StartRecording());
       EXPECT_TRUE(audio_device_->Recording());
-      EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
+      EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
       EXPECT_EQ(0, audio_device_->StopRecording());
       EXPECT_FALSE(audio_device_->Recording());
+      EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
     }
   }
 }
 
 #if defined(_WIN32) && !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
 TEST_F(AudioDeviceAPITest, SetAndGetWaveOutVolume) {
   uint32_t vol(0);
   // NOTE 1: Windows Wave only!
   // NOTE 2: It seems like the waveOutSetVolume API returns
   // MMSYSERR_NOTSUPPORTED on some Vista machines!
@@ skipping 964 matching lines @@
   EXPECT_EQ(48000, sampleRate);
 #elif defined(ANDROID)
   TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
   EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000));
 #elif defined(WEBRTC_IOS)
   TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
   EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000) ||
               (sampleRate == 8000));
 #endif
 }
-
-TEST_F(AudioDeviceAPITest, ResetAudioDevice) {
-  CheckInitialPlayoutStates();
-  CheckInitialRecordingStates();
-  EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE));
-  EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE));
-
-#if defined(WEBRTC_IOS)
-  // Not playing or recording, should just return 0
-  EXPECT_EQ(0, audio_device_->ResetAudioDevice());
-
-  EXPECT_EQ(0, audio_device_->InitRecording());
-  EXPECT_EQ(0, audio_device_->StartRecording());
-  EXPECT_EQ(0, audio_device_->InitPlayout());
-  EXPECT_EQ(0, audio_device_->StartPlayout());
-  for (int l=0; l<20; ++l)
-  {
-    TEST_LOG("Resetting sound device several time with pause %d ms\n", l);
-    EXPECT_EQ(0, audio_device_->ResetAudioDevice());
-    SleepMs(l);
-  }
-#else
-  // Fail tests
-  EXPECT_EQ(-1, audio_device_->ResetAudioDevice());
-
-  // TODO(kjellander): Fix so these tests pass on Mac.
-#if !defined(WEBRTC_MAC)
-  EXPECT_EQ(0, audio_device_->InitRecording());
-  EXPECT_EQ(0, audio_device_->StartRecording());
-  EXPECT_EQ(0, audio_device_->InitPlayout());
-  EXPECT_EQ(0, audio_device_->StartPlayout());
-#endif
-  EXPECT_EQ(-1, audio_device_->ResetAudioDevice());
-#endif
-  EXPECT_EQ(0, audio_device_->StopRecording());
-  EXPECT_EQ(0, audio_device_->StopPlayout());
-}
-
-TEST_F(AudioDeviceAPITest, SetPlayoutSpeaker) {
-  CheckInitialPlayoutStates();
-  EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE));
-
-  bool loudspeakerOn(false);
-#if defined(WEBRTC_IOS)
-  // Not playing or recording, should just return a success
-  EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
-  EXPECT_TRUE(loudspeakerOn);
-  EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(false));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
-  EXPECT_FALSE(loudspeakerOn);
-
-  EXPECT_EQ(0, audio_device_->InitPlayout());
-  EXPECT_EQ(0, audio_device_->StartPlayout());
-  EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
-  EXPECT_TRUE(loudspeakerOn);
-  EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(false));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
-  EXPECT_FALSE(loudspeakerOn);
-
-#else
-  // Fail tests
-  EXPECT_EQ(-1, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(-1, audio_device_->SetLoudspeakerStatus(false));
-  EXPECT_EQ(-1, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(-1, audio_device_->SetLoudspeakerStatus(false));
-
-  // TODO(kjellander): Fix so these tests pass on Mac.
-#if !defined(WEBRTC_MAC)
-  EXPECT_EQ(0, audio_device_->InitPlayout());
-  EXPECT_EQ(0, audio_device_->StartPlayout());
-#endif
-
-  EXPECT_EQ(-1, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
-#endif
-  EXPECT_EQ(0, audio_device_->StopPlayout());
-}