media/filters/video_decoder_selector_unittest.cc - Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

Unified Diff: media/filters/video_decoder_selector_unittest.cc

Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2049/src/

Patch Set: Created 6 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

Index: media/filters/video_decoder_selector_unittest.cc

===================================================================

--- media/filters/video_decoder_selector_unittest.cc (revision 277175)

+++ media/filters/video_decoder_selector_unittest.cc (working copy)

@@ -113,8 +113,6 @@

demuxer_stream_.get(),

false,

base::Bind(&VideoDecoderSelectorTest::MockOnDecoderSelected,

- base::Unretained(this)),

- base::Bind(&VideoDecoderSelectorTest::FrameReady,

base::Unretained(this)));

message_loop_.RunUntilIdle();

}

@@ -127,10 +125,6 @@

message_loop_.RunUntilIdle();

}

- void FrameReady(const scoped_refptr<VideoFrame>& frame) {

- NOTREACHED();

- }

// Fixture members.

scoped_ptr<VideoDecoderSelector> decoder_selector_;

scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_stream_;

@@ -171,7 +165,7 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -184,7 +178,7 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -196,9 +190,9 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_2_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));

EXPECT_CALL(*decoder_2_, Stop());

@@ -211,9 +205,9 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _));

+ EXPECT_CALL(*decoder_2_, Initialize(_, _, _));

EXPECT_CALL(*decoder_2_, Stop());

SelectDecoderAndAbort();

@@ -225,7 +219,7 @@

UseClearStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -237,7 +231,7 @@

UseClearStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -278,7 +272,7 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -291,7 +285,7 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -305,9 +299,9 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_2_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));

EXPECT_CALL(*decoder_2_, Stop());

@@ -320,9 +314,9 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

.WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _));

+ EXPECT_CALL(*decoder_2_, Initialize(_, _, _));

EXPECT_CALL(*decoder_2_, Stop());

SelectDecoderAndAbort();

« no previous file with comments | « media/filters/opus_audio_decoder_unittest.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »