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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/pipeline_unittest.cc

Issue 10918022: Move AudioDecoder initialization into AudioRenderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« media/base/filter_collection_unittest.cc ('K') | « media/base/pipeline.cc ('k') | media/filters/audio_renderer_impl.h » ('j') | media/filters/audio_renderer_impl.cc » ('J')
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 ca43938ae345cd8f5d7f86c066cbf9b40de752ae..e63246c6680d82c9f7ac5e5662608f546d53cc84 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -160,12 +160,6 @@ class PipelineTest : public ::testing::Test {
return stream;
}
- // Sets up expectations to allow the audio decoder to initialize.
- void InitializeAudioDecoder(const scoped_refptr<DemuxerStream>& stream) {
- EXPECT_CALL(*mocks_->audio_decoder(), Initialize(stream, _, _))
- .WillOnce(RunPipelineStatusCB());
- }
-
// Sets up expectations to allow the video renderer to initialize.
void InitializeVideoRenderer(const scoped_refptr<DemuxerStream>& stream) {
EXPECT_CALL(*mocks_->video_renderer(), Initialize(
@@ -182,19 +176,18 @@ class PipelineTest : public ::testing::Test {
}
// Sets up expectations to allow the audio renderer to initialize.
- void InitializeAudioRenderer(bool disable_after_init_cb = false) {
+ void InitializeAudioRenderer(const scoped_refptr<DemuxerStream>& stream,
+ bool disable_after_init_cb = false) {
Ami GONE FROM CHROMIUM 2012/09/07 14:40:02 wat default value!
if (disable_after_init_cb) {
EXPECT_CALL(*mocks_->audio_renderer(), Initialize(
- scoped_refptr<AudioDecoder>(mocks_->audio_decoder()),
- _, _, _, _, _, _))
- .WillOnce(DoAll(RunPipelineStatusCB(),
- WithArg<5>(RunClosure()))); // |disabled_cb|.
+ stream, _, _, _, _, _, _, _, _))
+ .WillOnce(DoAll(RunPipelineStatusCB2(),
+ WithArg<7>(RunClosure()))); // |disabled_cb|.
} else {
EXPECT_CALL(*mocks_->audio_renderer(), Initialize(
- scoped_refptr<AudioDecoder>(mocks_->audio_decoder()),
- _, _, _, _, _, _))
- .WillOnce(DoAll(SaveArg<3>(&audio_time_cb_),
- RunPipelineStatusCB()));
+ stream, _, _, _, _, _, _, _, _))
+ .WillOnce(DoAll(SaveArg<5>(&audio_time_cb_),
+ RunPipelineStatusCB2()));
}
}
@@ -394,8 +387,7 @@ TEST_F(PipelineTest, AudioStream) {
streams.push_back(audio_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializePipeline(PIPELINE_OK);
EXPECT_TRUE(pipeline_->HasAudio());
@@ -423,8 +415,7 @@ TEST_F(PipelineTest, AudioVideoStream) {
streams.push_back(video_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
@@ -440,8 +431,7 @@ TEST_F(PipelineTest, Seek) {
streams.push_back(video_stream());
InitializeDemuxer(&streams, base::TimeDelta::FromSeconds(3000));
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializeVideoRenderer(video_stream());
// Initialize then seek!
@@ -459,8 +449,7 @@ TEST_F(PipelineTest, SetVolume) {
streams.push_back(audio_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
// The audio renderer should receive a call to SetVolume().
float expected = 0.5f;
@@ -546,8 +535,7 @@ TEST_F(PipelineTest, DisableAudioRenderer) {
streams.push_back(video_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
@@ -570,8 +558,7 @@ TEST_F(PipelineTest, DisableAudioRendererDuringInit) {
streams.push_back(video_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer(true);
+ InitializeAudioRenderer(audio_stream(), true);
InitializeVideoRenderer(video_stream());
EXPECT_CALL(*mocks_->demuxer(),
@@ -594,8 +581,7 @@ TEST_F(PipelineTest, EndedCallback) {
streams.push_back(video_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
@@ -628,8 +614,7 @@ TEST_F(PipelineTest, AudioStreamShorterThanVideo) {
pipeline_->SetClockForTesting(new Clock(&StaticClockFunction));
InitializeDemuxer(&streams, duration);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializeVideoRenderer(video_stream());
InitializePipeline(PIPELINE_OK);
@@ -672,8 +657,7 @@ TEST_F(PipelineTest, ErrorDuringSeek) {
streams.push_back(audio_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializePipeline(PIPELINE_OK);
float playback_rate = 1.0f;
@@ -728,8 +712,7 @@ TEST_F(PipelineTest, NoMessageDuringTearDownFromError) {
streams.push_back(audio_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializePipeline(PIPELINE_OK);
// Trigger additional requests on the pipeline during tear down from error.
@@ -809,8 +792,7 @@ TEST_F(PipelineTest, AudioTimeUpdateDuringSeek) {
streams.push_back(audio_stream());
InitializeDemuxer(&streams);
- InitializeAudioDecoder(audio_stream());
- InitializeAudioRenderer();
+ InitializeAudioRenderer(audio_stream());
InitializePipeline(PIPELINE_OK);
float playback_rate = 1.0f;
@@ -917,7 +899,6 @@ class PipelineTeardownTest : public PipelineTest {
public:
enum TeardownState {
kInitDemuxer,
- kInitAudioDecoder,
kInitAudioRenderer,
kInitVideoRenderer,
kPausing,
@@ -939,7 +920,6 @@ class PipelineTeardownTest : public PipelineTest {
void RunTest(TeardownState state, StopOrError stop_or_error) {
switch (state) {
case kInitDemuxer:
- case kInitAudioDecoder:
case kInitAudioRenderer:
case kInitVideoRenderer:
DoInitialize(state, stop_or_error);
@@ -1008,33 +988,17 @@ class PipelineTeardownTest : public PipelineTest {
streams.push_back(video_stream());
InitializeDemuxer(&streams, base::TimeDelta::FromSeconds(3000));
- if (state == kInitAudioDecoder) {
- if (stop_or_error == kStop) {
- EXPECT_CALL(*mocks_->audio_decoder(), Initialize(_, _, _))
- .WillOnce(DoAll(Stop(pipeline_, stop_cb), RunPipelineStatusCB()));
- EXPECT_CALL(callbacks_, OnStop());
- } else {
- status = PIPELINE_ERROR_DECODE;
- EXPECT_CALL(*mocks_->audio_decoder(), Initialize(_, _, _))
- .WillOnce(RunPipelineStatusCBWithStatus(status));
- }
-
- EXPECT_CALL(*mocks_->demuxer(), Stop(_)).WillOnce(RunClosure());
- return status;
- }
-
- EXPECT_CALL(*mocks_->audio_decoder(), Initialize(_, _, _))
- .WillOnce(RunPipelineStatusCB());
-
if (state == kInitAudioRenderer) {
if (stop_or_error == kStop) {
- EXPECT_CALL(*mocks_->audio_renderer(), Initialize(_, _, _, _, _, _, _))
- .WillOnce(DoAll(Stop(pipeline_, stop_cb), RunPipelineStatusCB()));
+ EXPECT_CALL(*mocks_->audio_renderer(),
+ Initialize(_, _, _, _, _, _, _, _, _))
+ .WillOnce(DoAll(Stop(pipeline_, stop_cb), RunPipelineStatusCB2()));
EXPECT_CALL(callbacks_, OnStop());
} else {
status = PIPELINE_ERROR_INITIALIZATION_FAILED;
- EXPECT_CALL(*mocks_->audio_renderer(), Initialize(_, _, _, _, _, _, _))
- .WillOnce(RunPipelineStatusCBWithStatus(status));
+ EXPECT_CALL(*mocks_->audio_renderer(),
+ Initialize(_, _, _, _, _, _, _, _, _))
+ .WillOnce(RunPipelineStatusCB2WithStatus(status));
}
EXPECT_CALL(*mocks_->demuxer(), Stop(_)).WillOnce(RunClosure());
@@ -1042,8 +1006,9 @@ class PipelineTeardownTest : public PipelineTest {
return status;
}
- EXPECT_CALL(*mocks_->audio_renderer(), Initialize(_, _, _, _, _, _, _))
- .WillOnce(RunPipelineStatusCB());
+ EXPECT_CALL(*mocks_->audio_renderer(),
+ Initialize(_, _, _, _, _, _, _, _, _))
+ .WillOnce(RunPipelineStatusCB2());
if (state == kInitVideoRenderer) {
if (stop_or_error == kStop) {
@@ -1232,7 +1197,6 @@ class PipelineTeardownTest : public PipelineTest {
}
INSTANTIATE_TEARDOWN_TEST(Stop, InitDemuxer);
-INSTANTIATE_TEARDOWN_TEST(Stop, InitAudioDecoder);
INSTANTIATE_TEARDOWN_TEST(Stop, InitAudioRenderer);
INSTANTIATE_TEARDOWN_TEST(Stop, InitVideoRenderer);
INSTANTIATE_TEARDOWN_TEST(Stop, Pausing);
@@ -1243,7 +1207,6 @@ INSTANTIATE_TEARDOWN_TEST(Stop, Starting);
INSTANTIATE_TEARDOWN_TEST(Stop, Playing);
INSTANTIATE_TEARDOWN_TEST(Error, InitDemuxer);
-INSTANTIATE_TEARDOWN_TEST(Error, InitAudioDecoder);
INSTANTIATE_TEARDOWN_TEST(Error, InitAudioRenderer);
INSTANTIATE_TEARDOWN_TEST(Error, InitVideoRenderer);
INSTANTIATE_TEARDOWN_TEST(Error, Pausing);
« media/base/filter_collection_unittest.cc ('K') | « media/base/pipeline.cc ('k') | media/filters/audio_renderer_impl.h » ('j') | media/filters/audio_renderer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698