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

Unified Diff: media/base/audio_block_fifo_unittest.cc

Issue 2690793002: Add basic resample support to WASAPIAudioInputStream. (Closed)
Patch Set: Add check for unsupported channel layout Created 3 years, 10 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
« no previous file with comments | « media/base/audio_block_fifo.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_block_fifo_unittest.cc
diff --git a/media/base/audio_block_fifo_unittest.cc b/media/base/audio_block_fifo_unittest.cc
index d671e836ad1d420c1ed0881711fb07c2a3c39a6b..63b09ceecb2d05f9a4725e125955d49508002c94 100644
--- a/media/base/audio_block_fifo_unittest.cc
+++ b/media/base/audio_block_fifo_unittest.cc
@@ -18,8 +18,11 @@ class AudioBlockFifoTest : public testing::Test {
AudioBlockFifoTest() {}
~AudioBlockFifoTest() override {}
- void PushAndVerify(AudioBlockFifo* fifo, int frames_to_push,
- int channels, int block_frames, int max_frames) {
+ void PushAndVerify(AudioBlockFifo* fifo,
+ int frames_to_push,
+ int channels,
+ int block_frames,
+ int max_frames) {
for (int filled_frames = max_frames - fifo->GetUnfilledFrames();
filled_frames + frames_to_push <= max_frames;) {
Push(fifo, frames_to_push, channels);
@@ -39,7 +42,8 @@ class AudioBlockFifoTest : public testing::Test {
fifo->Push(data.get(), frames_to_push, bytes_per_sample);
}
- void ConsumeAndVerify(AudioBlockFifo* fifo, int expected_unfilled_frames,
+ void ConsumeAndVerify(AudioBlockFifo* fifo,
+ int expected_unfilled_frames,
int expected_available_blocks) {
const AudioBus* bus = fifo->Consume();
EXPECT_EQ(fifo->GetUnfilledFrames(), expected_unfilled_frames);
@@ -123,10 +127,9 @@ TEST_F(AudioBlockFifoTest, PushAndConsume) {
fifo.Clear();
int new_push_frames = 128;
// Change the input frame and try to fill up the FIFO.
- PushAndVerify(&fifo, new_push_frames, channels, frames,
- frames * blocks);
+ PushAndVerify(&fifo, new_push_frames, channels, frames, frames * blocks);
EXPECT_TRUE(fifo.GetUnfilledFrames() != 0);
- EXPECT_TRUE(fifo.available_blocks() == blocks -1);
+ EXPECT_TRUE(fifo.available_blocks() == blocks - 1);
// Consume all the existing filled blocks of data.
while (fifo.available_blocks()) {
@@ -145,8 +148,7 @@ TEST_F(AudioBlockFifoTest, PushAndConsume) {
// Completely fill up the buffer again.
new_push_frames = frames * blocks - remain_frames;
- PushAndVerify(&fifo, new_push_frames, channels, frames,
- frames * blocks);
+ PushAndVerify(&fifo, new_push_frames, channels, frames, frames * blocks);
EXPECT_TRUE(fifo.GetUnfilledFrames() == 0);
EXPECT_TRUE(fifo.available_blocks() == blocks);
}
@@ -169,6 +171,24 @@ TEST_F(AudioBlockFifoTest, PushAndConsumeOneBlockFifo) {
EXPECT_TRUE(fifo.GetUnfilledFrames() == frames);
}
+TEST_F(AudioBlockFifoTest, PushAndConsumeSilence) {
+ static const int channels = 2;
+ static const int frames = 441;
+ static const int blocks = 2;
+ AudioBlockFifo fifo(channels, frames, blocks);
+ // First push non-zero data.
+ Push(&fifo, frames, channels);
+ // Then push silence.
+ fifo.PushSilence(frames);
+ EXPECT_TRUE(fifo.GetUnfilledFrames() == 0);
+ EXPECT_TRUE(fifo.available_blocks() == blocks);
+
+ // Consume two blocks of data. The first should not be zero, but the second
+ // should be.
+ EXPECT_FALSE(fifo.Consume()->AreFramesZero());
+ EXPECT_TRUE(fifo.Consume()->AreFramesZero());
+}
+
// Dynamically increase the capacity of FIFO and verify buffers are correct.
TEST_F(AudioBlockFifoTest, DynamicallyIncreaseCapacity) {
// Create a FIFO with default blocks of buffers.
« no previous file with comments | « media/base/audio_block_fifo.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698