media/filters/video_decoder_selector_unittest.cc - Issue 297553002: Add callback in VideoDecoder and AudioDecoder to return decoded frames.

Unified Diff: media/filters/video_decoder_selector_unittest.cc

Issue 297553002: Add callback in VideoDecoder and AudioDecoder to return decoded frames. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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/filters/gpu_video_decoder.cc ('K') | « media/filters/opus_audio_decoder_unittest.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | media/filters/video_frame_stream_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/video_decoder_selector_unittest.cc

diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc

index 5a9b8093be5a4a457a72d030b098b50e92c1a9cb..62b1a421456bf22997c7f70158ea90020a52091c 100644

--- a/media/filters/video_decoder_selector_unittest.cc

+++ b/media/filters/video_decoder_selector_unittest.cc

@@ -113,6 +113,8 @@ class VideoDecoderSelectorTest : public ::testing::Test {

demuxer_stream_.get(),

false,

base::Bind(&VideoDecoderSelectorTest::MockOnDecoderSelected,

+ base::Unretained(this)),

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

base::Unretained(this)));

message_loop_.RunUntilIdle();

}

@@ -125,6 +127,10 @@ class VideoDecoderSelectorTest : public ::testing::Test {

message_loop_.RunUntilIdle();

}

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

+ NOTREACHED();

+ }

// Fixture members.

scoped_ptr<VideoDecoderSelector> decoder_selector_;

scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_stream_;

@@ -165,7 +171,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {

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());

@@ -178,7 +184,7 @@ TEST_F(VideoDecoderSelectorTest,

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 1);

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

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

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -190,9 +196,9 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {

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());

@@ -205,9 +211,9 @@ TEST_F(VideoDecoderSelectorTest,

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();

@@ -219,7 +225,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_HasDecryptor) {

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());

@@ -231,7 +237,7 @@ TEST_F(VideoDecoderSelectorTest, Abort_ClearStream_HasDecryptor) {

UseClearStream();

InitializeDecoderSelector(kDecryptOnly, 1);

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

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

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -272,7 +278,7 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {

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());

@@ -285,7 +291,7 @@ TEST_F(VideoDecoderSelectorTest,

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 1);

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

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

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -299,9 +305,9 @@ TEST_F(VideoDecoderSelectorTest,

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());

@@ -314,9 +320,9 @@ TEST_F(VideoDecoderSelectorTest,

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();