diff options
Diffstat (limited to 'media/base/audio_splicer_unittest.cc')
| -rw-r--r-- | media/base/audio_splicer_unittest.cc | 188 |
1 files changed, 98 insertions, 90 deletions
diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc index 2929007..4390268 100644 --- a/media/base/audio_splicer_unittest.cc +++ b/media/base/audio_splicer_unittest.cc @@ -3,44 +3,52 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" +#include "media/base/audio_buffer.h" +#include "media/base/audio_bus.h" #include "media/base/audio_splicer.h" #include "media/base/audio_timestamp_helper.h" #include "media/base/buffers.h" -#include "media/base/data_buffer.h" +#include "media/base/test_helpers.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { -static const int kBytesPerFrame = 4; +static const SampleFormat kSampleFormat = kSampleFormatF32; +static const int kChannels = 1; static const int kDefaultSampleRate = 44100; -static const int kDefaultBufferSize = 100 * kBytesPerFrame; +static const int kDefaultBufferSize = 100; class AudioSplicerTest : public ::testing::Test { public: AudioSplicerTest() - : splicer_(kBytesPerFrame, kDefaultSampleRate), - input_timestamp_helper_(kBytesPerFrame, kDefaultSampleRate) { + : splicer_(kDefaultSampleRate), + input_timestamp_helper_(kDefaultSampleRate) { input_timestamp_helper_.SetBaseTimestamp(base::TimeDelta()); } - scoped_refptr<DataBuffer> GetNextInputBuffer(uint8 value) { + scoped_refptr<AudioBuffer> GetNextInputBuffer(float value) { return GetNextInputBuffer(value, kDefaultBufferSize); } - scoped_refptr<DataBuffer> GetNextInputBuffer(uint8 value, int size) { - scoped_refptr<DataBuffer> buffer = new DataBuffer(size); - buffer->set_data_size(size); - memset(buffer->writable_data(), value, buffer->data_size()); - buffer->set_timestamp(input_timestamp_helper_.GetTimestamp()); - buffer->set_duration( - input_timestamp_helper_.GetDuration(buffer->data_size())); - input_timestamp_helper_.AddBytes(buffer->data_size()); + scoped_refptr<AudioBuffer> GetNextInputBuffer(float value, int frame_size) { + scoped_refptr<AudioBuffer> buffer = MakeInterleavedAudioBuffer<float>( + kSampleFormat, + kChannels, + value, + 0.0f, + frame_size, + input_timestamp_helper_.GetTimestamp(), + input_timestamp_helper_.GetFrameDuration(frame_size)); + input_timestamp_helper_.AddFrames(frame_size); return buffer; } - bool VerifyData(const uint8* data, int size, int value) { - for (int i = 0; i < size; ++i) { - if (data[i] != value) + bool VerifyData(scoped_refptr<AudioBuffer> buffer, float value) { + int frames = buffer->frame_count(); + scoped_ptr<AudioBus> bus = AudioBus::Create(kChannels, frames); + buffer->ReadFrames(frames, 0, 0, bus.get()); + for (int i = 0; i < frames; ++i) { + if (bus->channel(0)[i] != value) return false; } return true; @@ -57,38 +65,39 @@ TEST_F(AudioSplicerTest, PassThru) { EXPECT_FALSE(splicer_.HasNextBuffer()); // Test single buffer pass-thru behavior. - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); + EXPECT_TRUE(VerifyData(output_1, 0.1f)); // Test that multiple buffers can be queued in the splicer. - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2); - scoped_refptr<DataBuffer> input_3 = GetNextInputBuffer(3); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f); + scoped_refptr<AudioBuffer> input_3 = GetNextInputBuffer(0.3f); EXPECT_TRUE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.AddInput(input_3)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_TRUE(splicer_.HasNextBuffer()); EXPECT_EQ(input_2->timestamp(), output_2->timestamp()); EXPECT_EQ(input_2->duration(), output_2->duration()); - EXPECT_EQ(input_2->data_size(), output_2->data_size()); + EXPECT_EQ(input_2->frame_count(), output_2->frame_count()); - scoped_refptr<DataBuffer> output_3 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_3 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_3->timestamp(), output_3->timestamp()); EXPECT_EQ(input_3->duration(), output_3->duration()); - EXPECT_EQ(input_3->data_size(), output_3->data_size()); + EXPECT_EQ(input_3->frame_count(), output_3->frame_count()); } TEST_F(AudioSplicerTest, Reset) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.HasNextBuffer()); @@ -99,47 +108,47 @@ TEST_F(AudioSplicerTest, Reset) { // next buffer starts many frames beyond the end of // |input_1|. This is to make sure that Reset() actually // clears its state and doesn't try to insert a gap. - input_timestamp_helper_.AddBytes(100 * kBytesPerFrame); + input_timestamp_helper_.AddFrames(100); // Verify that a new input buffer passes through as expected. - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f); EXPECT_TRUE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_2->timestamp(), output_2->timestamp()); EXPECT_EQ(input_2->duration(), output_2->duration()); - EXPECT_EQ(input_2->data_size(), output_2->data_size()); + EXPECT_EQ(input_2->frame_count(), output_2->frame_count()); } TEST_F(AudioSplicerTest, EndOfStream) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); - scoped_refptr<DataBuffer> input_2 = DataBuffer::CreateEOSBuffer(); - scoped_refptr<DataBuffer> input_3 = GetNextInputBuffer(2); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); + scoped_refptr<AudioBuffer> input_2 = AudioBuffer::CreateEOSBuffer(); + scoped_refptr<AudioBuffer> input_3 = GetNextInputBuffer(0.2f); EXPECT_TRUE(input_2->end_of_stream()); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); EXPECT_TRUE(output_2->end_of_stream()); // Verify that buffers can be added again after Reset(). splicer_.Reset(); EXPECT_TRUE(splicer_.AddInput(input_3)); - scoped_refptr<DataBuffer> output_3 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_3 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_3->timestamp(), output_3->timestamp()); EXPECT_EQ(input_3->duration(), output_3->duration()); - EXPECT_EQ(input_3->data_size(), output_3->data_size()); + EXPECT_EQ(input_3->frame_count(), output_3->frame_count()); } @@ -152,30 +161,30 @@ TEST_F(AudioSplicerTest, EndOfStream) { // |11111111111111|0000|22222222222222| // +--------------+----+--------------+ TEST_F(AudioSplicerTest, GapInsertion) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); // Add bytes to the timestamp helper so that the next buffer // will have a starting timestamp that indicates a gap is // present. - const int kGapSize = 7 * kBytesPerFrame; - input_timestamp_helper_.AddBytes(kGapSize); - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2); + const int kGapSize = 7; + input_timestamp_helper_.AddFrames(kGapSize); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.AddInput(input_2)); // Verify that a gap buffer is generated. EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); - scoped_refptr<DataBuffer> output_3 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_3 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); // Verify that the first input buffer passed through unmodified. EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); - EXPECT_TRUE(VerifyData(output_1->data(), output_1->data_size(), 1)); + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); + EXPECT_TRUE(VerifyData(output_1, 0.1f)); // Verify the contents of the gap buffer. base::TimeDelta gap_timestamp = @@ -184,39 +193,39 @@ TEST_F(AudioSplicerTest, GapInsertion) { EXPECT_GT(gap_duration, base::TimeDelta()); EXPECT_EQ(gap_timestamp, output_2->timestamp()); EXPECT_EQ(gap_duration, output_2->duration()); - EXPECT_EQ(kGapSize, output_2->data_size()); - EXPECT_TRUE(VerifyData(output_2->data(), output_2->data_size(), 0)); + EXPECT_EQ(kGapSize, output_2->frame_count()); + EXPECT_TRUE(VerifyData(output_2, 0.0f)); // Verify that the second input buffer passed through unmodified. EXPECT_EQ(input_2->timestamp(), output_3->timestamp()); EXPECT_EQ(input_2->duration(), output_3->duration()); - EXPECT_EQ(input_2->data_size(), output_3->data_size()); - EXPECT_TRUE(VerifyData(output_3->data(), output_3->data_size(), 2)); + EXPECT_EQ(input_2->frame_count(), output_3->frame_count()); + EXPECT_TRUE(VerifyData(output_3, 0.2f)); } // Test that an error is signalled when the gap between input buffers is // too large. TEST_F(AudioSplicerTest, GapTooLarge) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); // Add a seconds worth of bytes so that an unacceptably large // gap exists between |input_1| and |input_2|. - const int kGapSize = kDefaultSampleRate * kBytesPerFrame; - input_timestamp_helper_.AddBytes(kGapSize); - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2); + const int kGapSize = kDefaultSampleRate; + input_timestamp_helper_.AddFrames(kGapSize); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_FALSE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); // Verify that the first input buffer passed through unmodified. EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); - EXPECT_TRUE(VerifyData(output_1->data(), output_1->data_size(), 1)); + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); + EXPECT_TRUE(VerifyData(output_1, 0.1f)); // Verify that the second buffer is not available. EXPECT_FALSE(splicer_.HasNextBuffer()); @@ -227,15 +236,15 @@ TEST_F(AudioSplicerTest, GapTooLarge) { input_1->timestamp() + input_1->duration()); // Verify that valid buffers are still accepted. - scoped_refptr<DataBuffer> input_3 = GetNextInputBuffer(3); + scoped_refptr<AudioBuffer> input_3 = GetNextInputBuffer(0.3f); EXPECT_TRUE(splicer_.AddInput(input_3)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); EXPECT_EQ(input_3->timestamp(), output_2->timestamp()); EXPECT_EQ(input_3->duration(), output_2->duration()); - EXPECT_EQ(input_3->data_size(), output_2->data_size()); - EXPECT_TRUE(VerifyData(output_2->data(), output_2->data_size(), 3)); + EXPECT_EQ(input_3->frame_count(), output_2->frame_count()); + EXPECT_TRUE(VerifyData(output_2, 0.3f)); } @@ -244,12 +253,12 @@ TEST_F(AudioSplicerTest, GapTooLarge) { TEST_F(AudioSplicerTest, BufferAddedBeforeBase) { input_timestamp_helper_.SetBaseTimestamp( base::TimeDelta::FromMicroseconds(10)); - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); // Reset the timestamp helper so the next buffer will have a timestamp earlier // than |input_1|. input_timestamp_helper_.SetBaseTimestamp(base::TimeDelta::FromSeconds(0)); - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.1f); EXPECT_GT(input_1->timestamp(), input_2->timestamp()); EXPECT_TRUE(splicer_.AddInput(input_1)); @@ -269,41 +278,40 @@ TEST_F(AudioSplicerTest, BufferAddedBeforeBase) { // |11111111111111|2222222222| // +--------------+----------+ TEST_F(AudioSplicerTest, PartialOverlap) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); // Reset timestamp helper so that the next buffer will have a // timestamp that starts in the middle of |input_1|. - const int kOverlapSize = input_1->data_size() / 4; + const int kOverlapSize = input_1->frame_count() / 4; input_timestamp_helper_.SetBaseTimestamp(input_1->timestamp()); - input_timestamp_helper_.AddBytes(input_1->data_size() - kOverlapSize); + input_timestamp_helper_.AddFrames(input_1->frame_count() - kOverlapSize); - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); // Verify that the first input buffer passed through unmodified. EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); - EXPECT_TRUE(VerifyData(output_1->data(), output_1->data_size(), 1)); - + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); + EXPECT_TRUE(VerifyData(output_1, 0.1f)); // Verify that the second input buffer was truncated to only contain - // the samples that are after the end of |input_1|. + // the samples that are after the end of |input_1|. Note that data is not + // copied, so |input_2|'s values are modified. base::TimeDelta expected_timestamp = input_1->timestamp() + input_1->duration(); base::TimeDelta expected_duration = (input_2->timestamp() + input_2->duration()) - expected_timestamp; EXPECT_EQ(expected_timestamp, output_2->timestamp()); EXPECT_EQ(expected_duration, output_2->duration()); - EXPECT_EQ(input_2->data_size() - kOverlapSize, output_2->data_size()); - EXPECT_TRUE(VerifyData(output_2->data(), output_2->data_size(), 2)); + EXPECT_TRUE(VerifyData(output_2, 0.2f)); } @@ -323,44 +331,44 @@ TEST_F(AudioSplicerTest, PartialOverlap) { // |11111111111111|3333333333333| // +--------------+-------------+ TEST_F(AudioSplicerTest, DropBuffer) { - scoped_refptr<DataBuffer> input_1 = GetNextInputBuffer(1); + scoped_refptr<AudioBuffer> input_1 = GetNextInputBuffer(0.1f); // Reset timestamp helper so that the next buffer will have a // timestamp that starts in the middle of |input_1|. - const int kOverlapOffset = input_1->data_size() / 2; - const int kOverlapSize = input_1->data_size() / 4; + const int kOverlapOffset = input_1->frame_count() / 2; + const int kOverlapSize = input_1->frame_count() / 4; input_timestamp_helper_.SetBaseTimestamp(input_1->timestamp()); - input_timestamp_helper_.AddBytes(kOverlapOffset); + input_timestamp_helper_.AddFrames(kOverlapOffset); - scoped_refptr<DataBuffer> input_2 = GetNextInputBuffer(2, kOverlapSize); + scoped_refptr<AudioBuffer> input_2 = GetNextInputBuffer(0.2f, kOverlapSize); // Reset the timestamp helper so the next buffer will be right after // |input_1|. input_timestamp_helper_.SetBaseTimestamp(input_1->timestamp()); - input_timestamp_helper_.AddBytes(input_1->data_size()); - scoped_refptr<DataBuffer> input_3 = GetNextInputBuffer(3); + input_timestamp_helper_.AddFrames(input_1->frame_count()); + scoped_refptr<AudioBuffer> input_3 = GetNextInputBuffer(0.3f); EXPECT_TRUE(splicer_.AddInput(input_1)); EXPECT_TRUE(splicer_.AddInput(input_2)); EXPECT_TRUE(splicer_.AddInput(input_3)); EXPECT_TRUE(splicer_.HasNextBuffer()); - scoped_refptr<DataBuffer> output_1 = splicer_.GetNextBuffer(); - scoped_refptr<DataBuffer> output_2 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_1 = splicer_.GetNextBuffer(); + scoped_refptr<AudioBuffer> output_2 = splicer_.GetNextBuffer(); EXPECT_FALSE(splicer_.HasNextBuffer()); // Verify that the first input buffer passed through unmodified. EXPECT_EQ(input_1->timestamp(), output_1->timestamp()); EXPECT_EQ(input_1->duration(), output_1->duration()); - EXPECT_EQ(input_1->data_size(), output_1->data_size()); - EXPECT_TRUE(VerifyData(output_1->data(), output_1->data_size(), 1)); + EXPECT_EQ(input_1->frame_count(), output_1->frame_count()); + EXPECT_TRUE(VerifyData(output_1, 0.1f)); // Verify that the second output buffer only contains // the samples that are in |input_3|. EXPECT_EQ(input_3->timestamp(), output_2->timestamp()); EXPECT_EQ(input_3->duration(), output_2->duration()); - EXPECT_EQ(input_3->data_size(), output_2->data_size()); - EXPECT_TRUE(VerifyData(output_2->data(), output_2->data_size(), 3)); + EXPECT_EQ(input_3->frame_count(), output_2->frame_count()); + EXPECT_TRUE(VerifyData(output_2, 0.3f)); } } // namespace media |