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

Unified Diff: media/audio/win/core_audio_util_win_unittest.cc

Issue 367923004: Turn audio ducking on by default on Windows again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 5 months 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
Index: media/audio/win/core_audio_util_win_unittest.cc
diff --git a/media/audio/win/core_audio_util_win_unittest.cc b/media/audio/win/core_audio_util_win_unittest.cc
index f18878cb06a907c46a1301220ae6031c2dbe7690..cc8271ecc2df353077644fc9f2a73baf855874a6 100644
--- a/media/audio/win/core_audio_util_win_unittest.cc
+++ b/media/audio/win/core_audio_util_win_unittest.cc
@@ -346,13 +346,13 @@ TEST_F(CoreAudioUtilWinTest, SharedModeInitialize) {
// Perform a shared-mode initialization without event-driven buffer handling.
uint32 endpoint_buffer_size = 0;
HRESULT hr = CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_TRUE(SUCCEEDED(hr));
EXPECT_GT(endpoint_buffer_size, 0u);
// It is only possible to create a client once.
hr = CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_FALSE(SUCCEEDED(hr));
EXPECT_EQ(hr, AUDCLNT_E_ALREADY_INITIALIZED);
@@ -360,7 +360,7 @@ TEST_F(CoreAudioUtilWinTest, SharedModeInitialize) {
client = CoreAudioUtil::CreateDefaultClient(eRender, eConsole);
EXPECT_TRUE(client);
hr = CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_TRUE(SUCCEEDED(hr));
EXPECT_GT(endpoint_buffer_size, 0u);
@@ -373,7 +373,7 @@ TEST_F(CoreAudioUtilWinTest, SharedModeInitialize) {
EXPECT_FALSE(CoreAudioUtil::IsFormatSupported(
client, AUDCLNT_SHAREMODE_SHARED, &format));
hr = CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_TRUE(FAILED(hr));
EXPECT_EQ(hr, E_INVALIDARG);
@@ -389,7 +389,7 @@ TEST_F(CoreAudioUtilWinTest, SharedModeInitialize) {
EXPECT_TRUE(CoreAudioUtil::IsFormatSupported(
client, AUDCLNT_SHAREMODE_SHARED, &format));
hr = CoreAudioUtil::SharedModeInitialize(client, &format, event_handle.Get(),
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_TRUE(SUCCEEDED(hr));
EXPECT_GT(endpoint_buffer_size, 0u);
}
@@ -420,7 +420,7 @@ TEST_F(CoreAudioUtilWinTest, CreateRenderAndCaptureClients) {
// Do a proper initialization and verify that it works this time.
CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
render_client = CoreAudioUtil::CreateRenderClient(client);
EXPECT_TRUE(render_client);
EXPECT_GT(endpoint_buffer_size, 0u);
@@ -432,7 +432,7 @@ TEST_F(CoreAudioUtilWinTest, CreateRenderAndCaptureClients) {
// Do a proper initialization and verify that it works this time.
CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
capture_client = CoreAudioUtil::CreateCaptureClient(client);
EXPECT_TRUE(capture_client);
EXPECT_GT(endpoint_buffer_size, 0u);
@@ -454,7 +454,7 @@ TEST_F(CoreAudioUtilWinTest, FillRenderEndpointBufferWithSilence) {
EXPECT_TRUE(SUCCEEDED(CoreAudioUtil::GetSharedModeMixFormat(client,
&format)));
CoreAudioUtil::SharedModeInitialize(client, &format, NULL,
- &endpoint_buffer_size);
+ &endpoint_buffer_size, NULL);
EXPECT_GT(endpoint_buffer_size, 0u);
ScopedComPtr<IAudioRenderClient> render_client(
« media/audio/win/core_audio_util_win.cc ('K') | « media/audio/win/core_audio_util_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698