media/audio/audio_output_controller_unittest.cc - Issue 4661001: Simplified AudioOutputStream interface.

Unified Diff: media/audio/audio_output_controller_unittest.cc

Issue 4661001: Simplified AudioOutputStream interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed all comments Created 10 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

Index: media/audio/audio_output_controller_unittest.cc

diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc

index 6997016b2902be448680c2f4fc45a0e87107992a..d70aed1bd17840b2349a33a5684f85cbb427c447 100644

--- a/media/audio/audio_output_controller_unittest.cc

+++ b/media/audio/audio_output_controller_unittest.cc

@@ -21,8 +21,9 @@ using ::testing::Return;

static const int kSampleRate = AudioParameters::kAudioCDSampleRate;

static const int kBitsPerSample = 16;

static const int kChannels = 2;

-static const int kHardwareBufferSize = kSampleRate * kBitsPerSample *

- kChannels / 8;

+static const int kSamplesPerPacket = kSampleRate / 10;

+static const int kHardwareBufferSize = kSamplesPerPacket * kChannels *

+ kBitsPerSample / 8;

static const int kBufferCapacity = 3 * kHardwareBufferSize;

namespace media {

@@ -97,10 +98,9 @@ TEST(AudioOutputControllerTest, CreateAndClose) {

EXPECT_CALL(event_handler, OnMoreData(NotNull(), _));

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioOutputController> controller =

- AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize, kBufferCapacity);

+ AudioOutputController::Create(&event_handler, params, kBufferCapacity);

ASSERT_TRUE(controller.get());

// Close the controller immediately.

@@ -128,10 +128,9 @@ TEST(AudioOutputControllerTest, PlayAndClose) {

.WillRepeatedly(SignalEvent(&event));

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioOutputController> controller =

- AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize, kBufferCapacity);

+ AudioOutputController::Create(&event_handler, params, kBufferCapacity);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -178,10 +177,9 @@ TEST(AudioOutputControllerTest, PlayPauseClose) {

.WillOnce(InvokeWithoutArgs(&pause_event, &base::WaitableEvent::Signal));

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioOutputController> controller =

- AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize, kBufferCapacity);

+ AudioOutputController::Create(&event_handler, params, kBufferCapacity);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -239,10 +237,9 @@ TEST(AudioOutputControllerTest, PlayPausePlay) {

.RetiresOnSaturation();

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioOutputController> controller =

- AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize, kBufferCapacity);

+ AudioOutputController::Create(&event_handler, params, kBufferCapacity);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -283,10 +280,10 @@ TEST(AudioOutputControllerTest, HardwareBufferTooLarge) {

// Create an audio device with a very large hardware buffer size.

MockAudioOutputControllerEventHandler event_handler;

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample,

+ kSamplesPerPacket * 1000);

scoped_refptr<AudioOutputController> controller =

AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize * 1000,

kBufferCapacity);

// Use assert because we don't stop the device and assume we can't

@@ -311,10 +308,9 @@ TEST(AudioOutputControllerTest, CloseTwice) {

.WillRepeatedly(SignalEvent(&event));

AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannels,

- kSampleRate, kBitsPerSample);

+ kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioOutputController> controller =

- AudioOutputController::Create(&event_handler, params,

- kHardwareBufferSize, kBufferCapacity);

+ AudioOutputController::Create(&event_handler, params, kBufferCapacity);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

« media/audio/audio_manager.h ('K') | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_parameters.h » ('j') | media/audio/audio_parameters.h » ('J')