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

Unified Diff: media/audio/alsa/alsa_output_unittest.cc

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Changes based on comments Created 4 years, 4 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/alsa/alsa_output_unittest.cc
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
index ce66804bf80c2c3d787d505545133d69bb737d63..897b55fb9a61931ec3d8b7be702ac2bc61964657 100644
--- a/media/audio/alsa/alsa_output_unittest.cc
+++ b/media/audio/alsa/alsa_output_unittest.cc
@@ -5,10 +5,13 @@
#include <stdint.h>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
+#include "base/test/simple_test_tick_clock.h"
#include "base/test/test_message_loop.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
#include "media/audio/alsa/alsa_output.h"
#include "media/audio/alsa/alsa_wrapper.h"
#include "media/audio/alsa/audio_manager_alsa.h"
@@ -215,7 +218,7 @@ char AlsaPcmOutputStreamTest::kGenericSurround50[] = "surround50";
// Custom action to clear a memory buffer.
ACTION(ClearBuffer) {
- arg0->Zero();
+ arg2->Zero();
}
TEST_F(AlsaPcmOutputStreamTest, ConstructedState) {
@@ -419,6 +422,9 @@ TEST_F(AlsaPcmOutputStreamTest, StartStop) {
// Open the stream.
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
ASSERT_TRUE(test_stream->Open());
+ base::SimpleTestTickClock* const tick_clock = new base::SimpleTestTickClock();
+ tick_clock->SetNowTicks(base::TimeTicks::Now());
+ test_stream->SetTickClockForTesting(base::WrapUnique(tick_clock));
// Expect Device setup.
EXPECT_CALL(mock_alsa_wrapper_, PcmDrop(kFakeHandle))
@@ -432,7 +438,7 @@ TEST_F(AlsaPcmOutputStreamTest, StartStop) {
.WillRepeatedly(Return(SND_PCM_STATE_RUNNING));
EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(kFakeHandle, _))
.WillRepeatedly(DoAll(SetArgumentPointee<1>(0), Return(0)));
- EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+ EXPECT_CALL(mock_callback, OnMoreData(tick_clock->NowTicks(), 0, _))
.WillRepeatedly(DoAll(ClearBuffer(), Return(kTestFramesPerPacket)));
EXPECT_CALL(mock_alsa_wrapper_, PcmWritei(kFakeHandle, _, _))
.WillRepeatedly(Return(kTestFramesPerPacket));
@@ -583,6 +589,9 @@ TEST_F(AlsaPcmOutputStreamTest, WritePacket_StopStream) {
TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
+ base::SimpleTestTickClock* const tick_clock = new base::SimpleTestTickClock();
+ tick_clock->SetNowTicks(base::TimeTicks::Now());
+ test_stream->SetTickClockForTesting(base::WrapUnique(tick_clock));
InitBuffer(test_stream);
test_stream->buffer_->Clear();
@@ -595,7 +604,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
.WillRepeatedly(Return(0)); // Buffer is full.
// Return a partially filled packet.
- EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+ EXPECT_CALL(mock_callback, OnMoreData(tick_clock->NowTicks(), 0, _))
.WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
bool source_exhausted;
@@ -610,6 +619,9 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
+ base::SimpleTestTickClock* const tick_clock = new base::SimpleTestTickClock();
+ tick_clock->SetNowTicks(base::TimeTicks::Now());
+ test_stream->SetTickClockForTesting(base::WrapUnique(tick_clock));
InitBuffer(test_stream);
test_stream->buffer_->Clear();
@@ -621,7 +633,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
.WillOnce(DoAll(SetArgumentPointee<1>(-1), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
- EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+ EXPECT_CALL(mock_callback, OnMoreData(tick_clock->NowTicks(), 0, _))
.WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
bool source_exhausted;
@@ -636,6 +648,9 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Underrun) {
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
+ base::SimpleTestTickClock* const tick_clock = new base::SimpleTestTickClock();
+ tick_clock->SetNowTicks(base::TimeTicks::Now());
+ test_stream->SetTickClockForTesting(base::WrapUnique(tick_clock));
InitBuffer(test_stream);
test_stream->buffer_->Clear();
@@ -645,7 +660,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Underrun) {
.WillOnce(Return(SND_PCM_STATE_XRUN));
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
- EXPECT_CALL(mock_callback, OnMoreData(_, 0, 0))
+ EXPECT_CALL(mock_callback, OnMoreData(tick_clock->NowTicks(), 0, _))
.WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
bool source_exhausted;

Powered by Google App Engine
This is Rietveld 408576698