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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 1999893004: Splits PipelineImpl into main and media thread components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 6 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/pipeline_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | media/blink/webmediaplayer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index db4bda1fdbfdc99ecafdf49d06d03e8c42ad5427..5a2f42a24655a69d5a7db901db78b4e25f1f026f 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -52,8 +52,8 @@ ACTION_P(Stop, pipeline) {
pipeline->Stop();
}
-ACTION_P2(SetError, pipeline, status) {
- pipeline->SetErrorForTesting(status);
+ACTION_P2(SetError, renderer_client, status) {
+ (*renderer_client)->OnError(status);
}
ACTION_P2(SetBufferingState, renderer_client, buffering_state) {
@@ -95,6 +95,7 @@ class PipelineImplTest : public ::testing::Test {
: pipeline_(
new PipelineImpl(message_loop_.task_runner(), new MediaLog())),
demuxer_(new StrictMock<MockDemuxer>()),
+ demuxer_host_(nullptr),
scoped_renderer_(new StrictMock<MockRenderer>()),
renderer_(scoped_renderer_.get()),
renderer_client_(nullptr) {
@@ -113,28 +114,22 @@ class PipelineImplTest : public ::testing::Test {
}
virtual ~PipelineImplTest() {
- if (!pipeline_ || !pipeline_->IsRunning())
- return;
+ if (pipeline_->IsRunning()) {
+ ExpectDemuxerStop();
- ExpectDemuxerStop();
+ // The mock demuxer doesn't stop the fake text track stream,
+ // so just stop it manually.
+ if (text_stream_)
+ text_stream_->Stop();
- // The mock demuxer doesn't stop the fake text track stream,
- // so just stop it manually.
- if (text_stream_) {
- text_stream_->Stop();
- message_loop_.RunUntilIdle();
+ pipeline_->Stop();
}
+ pipeline_.reset();
message_loop_.RunUntilIdle();
- pipeline_->Stop();
- DestroyPipeline();
}
- void OnDemuxerError() {
- // Cast because OnDemuxerError is private in Pipeline.
- static_cast<DemuxerHost*>(pipeline_.get())
- ->OnDemuxerError(PIPELINE_ERROR_ABORT);
- }
+ void OnDemuxerError() { demuxer_host_->OnDemuxerError(PIPELINE_ERROR_ABORT); }
protected:
// Sets up expectations to allow the demuxer to initialize.
@@ -143,7 +138,8 @@ class PipelineImplTest : public ::testing::Test {
const base::TimeDelta& duration) {
EXPECT_CALL(callbacks_, OnDurationChange());
EXPECT_CALL(*demuxer_, Initialize(_, _, _))
- .WillOnce(DoAll(SetDemuxerProperties(duration),
+ .WillOnce(DoAll(SaveArg<0>(&demuxer_host_),
+ SetDemuxerProperties(duration),
PostCallback<1>(PIPELINE_OK)));
// Configure the demuxer to return the streams.
@@ -178,9 +174,8 @@ class PipelineImplTest : public ::testing::Test {
void AddTextStream() {
EXPECT_CALL(callbacks_, OnAddTextTrack(_, _))
.WillOnce(Invoke(this, &PipelineImplTest::DoOnAddTextTrack));
- static_cast<DemuxerHost*>(pipeline_.get())
- ->AddTextStream(text_stream(),
- TextTrackConfig(kTextSubtitles, "", "", ""));
+ demuxer_host_->AddTextStream(text_stream(),
+ TextTrackConfig(kTextSubtitles, "", "", ""));
message_loop_.RunUntilIdle();
}
@@ -295,13 +290,6 @@ class PipelineImplTest : public ::testing::Test {
message_loop_.RunUntilIdle();
}
- void DestroyPipeline() {
- // In real code Pipeline could be destroyed on a different thread. All weak
- // pointers must have been invalidated before the stop callback returns.
- DCHECK(!pipeline_->HasWeakPtrsForTesting());
- pipeline_.reset();
- }
-
void ExpectDemuxerStop() {
if (demuxer_)
EXPECT_CALL(*demuxer_, Stop());
@@ -316,9 +304,12 @@ class PipelineImplTest : public ::testing::Test {
void RunBufferedTimeRangesTest(const base::TimeDelta duration) {
EXPECT_EQ(0u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_FALSE(pipeline_->DidLoadingProgress());
+
Ranges<base::TimeDelta> ranges;
ranges.Add(base::TimeDelta(), duration);
- pipeline_->OnBufferedTimeRangesChanged(ranges);
+ demuxer_host_->OnBufferedTimeRangesChanged(ranges);
+ message_loop_.RunUntilIdle();
+
EXPECT_TRUE(pipeline_->DidLoadingProgress());
EXPECT_FALSE(pipeline_->DidLoadingProgress());
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
@@ -333,6 +324,7 @@ class PipelineImplTest : public ::testing::Test {
std::unique_ptr<PipelineImpl> pipeline_;
std::unique_ptr<StrictMock<MockDemuxer>> demuxer_;
+ DemuxerHost* demuxer_host_;
std::unique_ptr<StrictMock<MockRenderer>> scoped_renderer_;
StrictMock<MockRenderer>* renderer_;
StrictMock<CallbackHelper> text_renderer_callbacks_;
@@ -423,6 +415,7 @@ TEST_F(PipelineImplTest, DemuxerErrorDuringStop) {
EXPECT_CALL(*demuxer_, Stop())
.WillOnce(InvokeWithoutArgs(this, &PipelineImplTest::OnDemuxerError));
pipeline_->Stop();
+ message_loop_.RunUntilIdle();
}
TEST_F(PipelineImplTest, NoStreams) {
@@ -542,9 +535,7 @@ TEST_F(PipelineImplTest, SeekAfterError) {
EXPECT_CALL(*demuxer_, Stop());
EXPECT_CALL(callbacks_, OnError(_));
-
- static_cast<DemuxerHost*>(pipeline_.get())
- ->OnDemuxerError(PIPELINE_ERROR_ABORT);
+ OnDemuxerError();
message_loop_.RunUntilIdle();
pipeline_->Seek(
@@ -571,6 +562,8 @@ TEST_F(PipelineImplTest, SuspendResume) {
stats.audio_memory_usage = 12345;
stats.video_memory_usage = 67890;
renderer_client_->OnStatisticsUpdate(stats);
+ message_loop_.RunUntilIdle();
+
EXPECT_EQ(stats.audio_memory_usage,
pipeline_->GetStatistics().audio_memory_usage);
EXPECT_EQ(stats.video_memory_usage,
@@ -579,8 +572,8 @@ TEST_F(PipelineImplTest, SuspendResume) {
ExpectSuspend();
DoSuspend();
- EXPECT_EQ(pipeline_->GetStatistics().audio_memory_usage, 0);
- EXPECT_EQ(pipeline_->GetStatistics().video_memory_usage, 0);
+ EXPECT_EQ(0, pipeline_->GetStatistics().audio_memory_usage);
+ EXPECT_EQ(0, pipeline_->GetStatistics().video_memory_usage);
base::TimeDelta expected = base::TimeDelta::FromSeconds(2000);
ExpectResume(expected);
@@ -641,7 +634,8 @@ TEST_F(PipelineImplTest, GetBufferedTimeRanges) {
TEST_F(PipelineImplTest, BufferedTimeRangesCanChangeAfterStop) {
EXPECT_CALL(*demuxer_, Initialize(_, _, _))
- .WillOnce(PostCallback<1>(PIPELINE_OK));
+ .WillOnce(
+ DoAll(SaveArg<0>(&demuxer_host_), PostCallback<1>(PIPELINE_OK)));
EXPECT_CALL(*demuxer_, Stop());
EXPECT_CALL(callbacks_, OnMetadata(_));
EXPECT_CALL(callbacks_, OnStart(_));
@@ -650,7 +644,6 @@ TEST_F(PipelineImplTest, BufferedTimeRangesCanChangeAfterStop) {
pipeline_->Stop();
RunBufferedTimeRangesTest(base::TimeDelta::FromSeconds(5));
- DestroyPipeline();
}
TEST_F(PipelineImplTest, EndedCallback) {
@@ -902,15 +895,14 @@ class PipelineTeardownTest : public PipelineImplTest {
EXPECT_CALL(*renderer_, Initialize(_, _, _))
.WillOnce(
DoAll(Stop(pipeline_.get()), PostCallback<2>(PIPELINE_OK)));
- // Note: OnStart or OnMetadata callback are not called
- // after pipeline is stopped.
+ // Note: OnStart callback is not called after pipeline is stopped.
} else {
EXPECT_CALL(*renderer_, Initialize(_, _, _))
.WillOnce(PostCallback<2>(PIPELINE_ERROR_INITIALIZATION_FAILED));
- EXPECT_CALL(callbacks_, OnMetadata(_));
EXPECT_CALL(callbacks_, OnStart(PIPELINE_ERROR_INITIALIZATION_FAILED));
}
+ EXPECT_CALL(callbacks_, OnMetadata(_));
EXPECT_CALL(*demuxer_, Stop());
return;
}
@@ -954,7 +946,7 @@ class PipelineTeardownTest : public PipelineImplTest {
EXPECT_CALL(*renderer_, Flush(_))
.WillOnce(DoAll(
SetBufferingState(&renderer_client_, BUFFERING_HAVE_NOTHING),
- SetError(pipeline_.get(), PIPELINE_ERROR_READ),
+ SetError(&renderer_client_, PIPELINE_ERROR_READ),
RunClosure<0>()));
EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING));
EXPECT_CALL(callbacks_, OnSeek(PIPELINE_ERROR_READ));
@@ -1029,8 +1021,6 @@ class PipelineTeardownTest : public PipelineImplTest {
}
void DoStopOrError(StopOrError stop_or_error, bool expect_errors) {
- InSequence s;
-
switch (stop_or_error) {
case kStop:
EXPECT_CALL(*demuxer_, Stop());
@@ -1042,14 +1032,14 @@ class PipelineTeardownTest : public PipelineImplTest {
EXPECT_CALL(*demuxer_, Stop());
EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_READ));
}
- pipeline_->SetErrorForTesting(PIPELINE_ERROR_READ);
+ renderer_client_->OnError(PIPELINE_ERROR_READ);
break;
case kErrorAndStop:
EXPECT_CALL(*demuxer_, Stop());
if (expect_errors)
EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_READ));
- pipeline_->SetErrorForTesting(PIPELINE_ERROR_READ);
+ renderer_client_->OnError(PIPELINE_ERROR_READ);
message_loop_.RunUntilIdle();
pipeline_->Stop();
break;
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | media/blink/webmediaplayer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698