Commit 6bef0044 authored by Aidan Wolter's avatar Aidan Wolter Committed by Commit Bot

Zero out AudioBus in CAM test

Memory sanitizer is failing for CastAudioManagerTest because the
audio bus data is not initialized.

Bug: b/111993375
Test: cast_media_unittests+msan
Change-Id: I5ef5c7e0dbc5247fbdeccef1f04c3e295a62a93c
Reviewed-on: https://chromium-review.googlesource.com/1191522Reviewed-by: default avatarKenneth MacKay <kmackay@chromium.org>
Commit-Queue: Aidan Wolter <awolter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586410}
parent 6ae843f0
...@@ -49,6 +49,15 @@ std::unique_ptr<service_manager::Connector> CreateConnector() { ...@@ -49,6 +49,15 @@ std::unique_ptr<service_manager::Connector> CreateConnector() {
service_manager::mojom::ConnectorRequest request; service_manager::mojom::ConnectorRequest request;
return service_manager::Connector::Create(&request); return service_manager::Connector::Create(&request);
} }
int OnMoreData(base::TimeDelta delay,
base::TimeTicks delay_timestamp,
int prior_frames_skipped,
::media::AudioBus* dest) {
dest->Zero();
return kDefaultAudioParams.frames_per_buffer();
}
} // namespace } // namespace
namespace chromecast { namespace chromecast {
...@@ -169,7 +178,7 @@ TEST_F(CastAudioManagerTest, CanMakeStream) { ...@@ -169,7 +178,7 @@ TEST_F(CastAudioManagerTest, CanMakeStream) {
EXPECT_TRUE(stream->Open()); EXPECT_TRUE(stream->Open());
EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _)) EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _))
.WillRepeatedly(Return(kDefaultAudioParams.frames_per_buffer())); .WillRepeatedly(Invoke(OnMoreData));
EXPECT_CALL(mock_source_callback_, OnError()).Times(0); EXPECT_CALL(mock_source_callback_, OnError()).Times(0);
stream->Start(&mock_source_callback_); stream->Start(&mock_source_callback_);
scoped_task_environment_.RunUntilIdle(); scoped_task_environment_.RunUntilIdle();
...@@ -187,7 +196,7 @@ TEST_F(CastAudioManagerTest, CanMakeStreamProxy) { ...@@ -187,7 +196,7 @@ TEST_F(CastAudioManagerTest, CanMakeStreamProxy) {
EXPECT_TRUE(stream->Open()); EXPECT_TRUE(stream->Open());
EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _)) EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _))
.WillRepeatedly(Return(kDefaultAudioParams.frames_per_buffer())); .WillRepeatedly(Invoke(OnMoreData));
EXPECT_CALL(mock_source_callback_, OnError()).Times(0); EXPECT_CALL(mock_source_callback_, OnError()).Times(0);
stream->Start(&mock_source_callback_); stream->Start(&mock_source_callback_);
scoped_task_environment_.RunUntilIdle(); scoped_task_environment_.RunUntilIdle();
...@@ -206,7 +215,7 @@ TEST_F(CastAudioManagerTest, CanMakeMixerStream) { ...@@ -206,7 +215,7 @@ TEST_F(CastAudioManagerTest, CanMakeMixerStream) {
EXPECT_TRUE(stream->Open()); EXPECT_TRUE(stream->Open());
EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _)) EXPECT_CALL(mock_source_callback_, OnMoreData(_, _, _, _))
.WillRepeatedly(Return(kDefaultAudioParams.frames_per_buffer())); .WillRepeatedly(Invoke(OnMoreData));
EXPECT_CALL(mock_source_callback_, OnError()).Times(0); EXPECT_CALL(mock_source_callback_, OnError()).Times(0);
stream->Start(&mock_source_callback_); stream->Start(&mock_source_callback_);
scoped_task_environment_.RunUntilIdle(); scoped_task_environment_.RunUntilIdle();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment