Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/audio_device/test/audio_device_test_api.cc

Issue 2466613002: Adds thread safety annotations to the AudioDeviceBuffer class (Closed)
Patch Set: Improved thread annotation Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/modules/audio_device/audio_device_buffer.cc ('K') | « webrtc/modules/audio_device/audio_device_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/test/audio_device_test_api.cc
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index 3c754203b02794ff2713b8575788ccf5c7109abe..2e511464f768fe2dbec81763e12103fc1dc4efe2 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -633,7 +633,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
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));
@@ -648,9 +648,10 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
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
@@ -663,9 +664,10 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
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));
}
}
}
@@ -690,7 +692,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
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));
@@ -705,9 +707,10 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
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
@@ -720,9 +723,10 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
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));
}
}
}
@@ -1707,81 +1711,3 @@ TEST_F(AudioDeviceAPITest, PlayoutSampleRate) {
(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());
-}
« webrtc/modules/audio_device/audio_device_buffer.cc ('K') | « webrtc/modules/audio_device/audio_device_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698