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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/pipeline_unittest.cc

Issue 206103004: Remove HasAudio(), HasVideo(), GetInitialNaturalSize() from media::Pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase /again/. Created 6 years, 9 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.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 3264226ad02964c2e91daec5eb3a0b6eb4aa9cb6..6e5180222c718c68c8dab7dd8a30d4eacac33885 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -66,7 +66,8 @@ class CallbackHelper {
MOCK_METHOD0(OnStop, void());
MOCK_METHOD0(OnEnded, void());
MOCK_METHOD1(OnError, void(PipelineStatus));
- MOCK_METHOD1(OnBufferingState, void(Pipeline::BufferingState));
+ MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
+ MOCK_METHOD0(OnPrerollCompleted, void());
MOCK_METHOD0(OnDurationChange, void());
private:
@@ -203,7 +204,7 @@ class PipelineTest : public ::testing::Test {
EXPECT_CALL(callbacks_, OnStart(start_status));
if (start_status == PIPELINE_OK) {
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kHaveMetadata));
+ EXPECT_CALL(callbacks_, OnMetadata(_)).WillOnce(SaveArg<0>(&metadata_));
if (audio_stream_) {
EXPECT_CALL(*audio_renderer_, SetPlaybackRate(0.0f));
@@ -215,7 +216,7 @@ class PipelineTest : public ::testing::Test {
EXPECT_CALL(*audio_renderer_, Play(_))
.WillOnce(RunClosure<0>());
}
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kPrerollCompleted));
+ EXPECT_CALL(callbacks_, OnPrerollCompleted());
}
pipeline_->Start(
@@ -223,7 +224,8 @@ class PipelineTest : public ::testing::Test {
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnBufferingState,
+ base::Bind(&CallbackHelper::OnMetadata, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnPrerollCompleted,
base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnDurationChange,
base::Unretained(&callbacks_)));
@@ -286,7 +288,7 @@ class PipelineTest : public ::testing::Test {
.WillOnce(RunClosure<0>());
}
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kPrerollCompleted));
+ EXPECT_CALL(callbacks_, OnPrerollCompleted());
// We expect a successful seek callback.
EXPECT_CALL(callbacks_, OnSeek(PIPELINE_OK));
@@ -340,6 +342,7 @@ class PipelineTest : public ::testing::Test {
scoped_ptr<FakeTextTrackStream> text_stream_;
AudioRenderer::TimeCB audio_time_cb_;
VideoDecoderConfig video_decoder_config_;
+ PipelineMetadata metadata_;
private:
DISALLOW_COPY_AND_ASSIGN(PipelineTest);
@@ -351,8 +354,6 @@ TEST_F(PipelineTest, NotStarted) {
const base::TimeDelta kZero;
EXPECT_FALSE(pipeline_->IsRunning());
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_FALSE(pipeline_->HasVideo());
// Setting should still work.
EXPECT_EQ(0.0f, pipeline_->GetPlaybackRate());
@@ -373,11 +374,6 @@ TEST_F(PipelineTest, NotStarted) {
EXPECT_TRUE(kZero == pipeline_->GetMediaDuration());
EXPECT_EQ(0, pipeline_->GetTotalBytes());
-
- // Should always be zero.
- gfx::Size size = pipeline_->GetInitialNaturalSize();
- EXPECT_EQ(0, size.width());
- EXPECT_EQ(0, size.height());
}
TEST_F(PipelineTest, NeverInitializes) {
@@ -392,7 +388,8 @@ TEST_F(PipelineTest, NeverInitializes) {
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnBufferingState,
+ base::Bind(&CallbackHelper::OnMetadata, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnPrerollCompleted,
base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnDurationChange,
base::Unretained(&callbacks_)));
@@ -433,8 +430,8 @@ TEST_F(PipelineTest, AudioStream) {
InitializeAudioRenderer(audio_stream(), false);
InitializePipeline(PIPELINE_OK);
- EXPECT_TRUE(pipeline_->HasAudio());
- EXPECT_FALSE(pipeline_->HasVideo());
+ EXPECT_TRUE(metadata_.has_audio);
+ EXPECT_FALSE(metadata_.has_video);
}
TEST_F(PipelineTest, VideoStream) {
@@ -446,8 +443,8 @@ TEST_F(PipelineTest, VideoStream) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_FALSE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
}
TEST_F(PipelineTest, AudioVideoStream) {
@@ -462,8 +459,8 @@ TEST_F(PipelineTest, AudioVideoStream) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_TRUE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_TRUE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
}
TEST_F(PipelineTest, VideoTextStream) {
@@ -476,8 +473,8 @@ TEST_F(PipelineTest, VideoTextStream) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_FALSE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
AddTextStream();
message_loop_.RunUntilIdle();
@@ -496,8 +493,8 @@ TEST_F(PipelineTest, VideoAudioTextStream) {
InitializeAudioRenderer(audio_stream(), false);
InitializePipeline(PIPELINE_OK);
- EXPECT_TRUE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_TRUE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
AddTextStream();
message_loop_.RunUntilIdle();
@@ -623,8 +620,8 @@ TEST_F(PipelineTest, DisableAudioRenderer) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_TRUE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_TRUE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
EXPECT_CALL(*demuxer_, OnAudioRendererDisabled());
pipeline_->OnAudioDisabled();
@@ -648,8 +645,8 @@ TEST_F(PipelineTest, DisableAudioRendererDuringInit) {
EXPECT_CALL(*demuxer_, OnAudioRendererDisabled());
InitializePipeline(PIPELINE_OK);
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_TRUE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
// Verify that ended event is fired when video ends.
EXPECT_CALL(callbacks_, OnEnded());
@@ -831,8 +828,8 @@ TEST_F(PipelineTest, StartTimeIsZero) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_FALSE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
EXPECT_EQ(base::TimeDelta(), pipeline_->GetMediaTime());
}
@@ -852,8 +849,8 @@ TEST_F(PipelineTest, StartTimeIsNonZero) {
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
- EXPECT_FALSE(pipeline_->HasAudio());
- EXPECT_TRUE(pipeline_->HasVideo());
+ EXPECT_FALSE(metadata_.has_audio);
+ EXPECT_TRUE(metadata_.has_video);
EXPECT_EQ(kStartTime, pipeline_->GetMediaTime());
}
@@ -905,7 +902,7 @@ TEST_F(PipelineTest, AudioTimeUpdateDuringSeek) {
EXPECT_CALL(*audio_renderer_, Play(_))
.WillOnce(RunClosure<0>());
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kPrerollCompleted));
+ EXPECT_CALL(callbacks_, OnPrerollCompleted());
EXPECT_CALL(callbacks_, OnSeek(PIPELINE_OK));
DoSeek(seek_time);
@@ -999,7 +996,8 @@ class PipelineTeardownTest : public PipelineTest {
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnBufferingState,
+ base::Bind(&CallbackHelper::OnMetadata, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnPrerollCompleted,
base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnDurationChange,
base::Unretained(&callbacks_)));
@@ -1076,7 +1074,7 @@ class PipelineTeardownTest : public PipelineTest {
EXPECT_CALL(*video_renderer_, Initialize(_, _, _, _, _, _, _, _))
.WillOnce(RunCallback<1>(PIPELINE_OK));
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kHaveMetadata));
+ EXPECT_CALL(callbacks_, OnMetadata(_));
// If we get here it's a successful initialization.
EXPECT_CALL(*audio_renderer_, Preroll(base::TimeDelta(), _))
@@ -1094,7 +1092,7 @@ class PipelineTeardownTest : public PipelineTest {
.WillOnce(RunClosure<0>());
if (status == PIPELINE_OK)
- EXPECT_CALL(callbacks_, OnBufferingState(Pipeline::kPrerollCompleted));
+ EXPECT_CALL(callbacks_, OnPrerollCompleted());
return status;
}
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698