Commit 667512ff authored by kmackay's avatar kmackay Committed by Commit bot

[Chromecast] Fix media unit tests

The AudioVideoPipelineDeviceTest was not stopping the monitor loop correctly.

BUG= internal b/26133365

Review URL: https://codereview.chromium.org/1504923009

Cr-Commit-Position: refs/heads/master@{#364467}
parent 443df85b
...@@ -148,6 +148,7 @@ class AudioVideoPipelineDeviceTest : public testing::Test { ...@@ -148,6 +148,7 @@ class AudioVideoPipelineDeviceTest : public testing::Test {
scoped_ptr<MediaPipelineBackend> backend_; scoped_ptr<MediaPipelineBackend> backend_;
scoped_ptr<BufferFeeder> audio_feeder_; scoped_ptr<BufferFeeder> audio_feeder_;
scoped_ptr<BufferFeeder> video_feeder_; scoped_ptr<BufferFeeder> video_feeder_;
bool stopped_;
// Current media time. // Current media time.
base::TimeDelta pause_time_; base::TimeDelta pause_time_;
...@@ -286,7 +287,7 @@ scoped_ptr<BufferFeeder> BufferFeeder::LoadVideo(MediaPipelineBackend* backend, ...@@ -286,7 +287,7 @@ scoped_ptr<BufferFeeder> BufferFeeder::LoadVideo(MediaPipelineBackend* backend,
} // namespace } // namespace
AudioVideoPipelineDeviceTest::AudioVideoPipelineDeviceTest() AudioVideoPipelineDeviceTest::AudioVideoPipelineDeviceTest()
: pause_pattern_() {} : stopped_(false), pause_pattern_() {}
AudioVideoPipelineDeviceTest::~AudioVideoPipelineDeviceTest() {} AudioVideoPipelineDeviceTest::~AudioVideoPipelineDeviceTest() {}
...@@ -338,6 +339,7 @@ void AudioVideoPipelineDeviceTest::ConfigureForFile( ...@@ -338,6 +339,7 @@ void AudioVideoPipelineDeviceTest::ConfigureForFile(
void AudioVideoPipelineDeviceTest::Start() { void AudioVideoPipelineDeviceTest::Start() {
pause_time_ = base::TimeDelta(); pause_time_ = base::TimeDelta();
pause_pattern_idx_ = 0; pause_pattern_idx_ = 0;
stopped_ = false;
if (audio_feeder_) if (audio_feeder_)
audio_feeder_->Start(); audio_feeder_->Start();
...@@ -355,6 +357,7 @@ void AudioVideoPipelineDeviceTest::OnEndOfStream() { ...@@ -355,6 +357,7 @@ void AudioVideoPipelineDeviceTest::OnEndOfStream() {
if ((!audio_feeder_ || audio_feeder_->eos()) && if ((!audio_feeder_ || audio_feeder_->eos()) &&
(!video_feeder_ || video_feeder_->eos())) { (!video_feeder_ || video_feeder_->eos())) {
bool success = backend_->Stop(); bool success = backend_->Stop();
stopped_ = true;
ASSERT_TRUE(success); ASSERT_TRUE(success);
base::MessageLoop::current()->QuitWhenIdle(); base::MessageLoop::current()->QuitWhenIdle();
} }
...@@ -362,7 +365,7 @@ void AudioVideoPipelineDeviceTest::OnEndOfStream() { ...@@ -362,7 +365,7 @@ void AudioVideoPipelineDeviceTest::OnEndOfStream() {
void AudioVideoPipelineDeviceTest::MonitorLoop() { void AudioVideoPipelineDeviceTest::MonitorLoop() {
// Backend is stopped, no need to monitor the loop any more. // Backend is stopped, no need to monitor the loop any more.
if (!audio_feeder_ && !video_feeder_) if (stopped_)
return; return;
base::TimeDelta media_time = base::TimeDelta media_time =
......
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