media/filters/video_decoder_selector_unittest.cc - Issue 1143223007: media: Reland "Simplify {Audio|Video}Decoder initialization callback."

Unified Diff: media/filters/video_decoder_selector_unittest.cc

Issue 1143223007: media: Reland "Simplify {Audio|Video}Decoder initialization callback." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

index 86f4c0eca1c6abb347cc1c56012507506baaeaf0..2471e76c908efe99710c6ff0124d90174af6471f 100644

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

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

@@ -194,7 +194,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {

InitializeDecoderSelector(kNoDecryptor, 1);

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

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

+ .WillOnce(RunCallback<2>(true));

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

SelectDecoder();

@@ -217,9 +217,9 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {

InitializeDecoderSelector(kNoDecryptor, 2);

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

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

+ .WillOnce(RunCallback<2>(false));

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

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

+ .WillOnce(RunCallback<2>(true));

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

SelectDecoder();

@@ -231,7 +231,7 @@ TEST_F(VideoDecoderSelectorTest,

InitializeDecoderSelector(kNoDecryptor, 2);

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

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

+ .WillOnce(RunCallback<2>(false));

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

SelectDecoderAndDestroy();

@@ -244,7 +244,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_HasDecryptor) {

InitializeDecoderSelector(kDecryptOnly, 1);

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

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

+ .WillOnce(RunCallback<2>(true));

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

SelectDecoder();

@@ -295,7 +295,7 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {

InitializeDecoderSelector(kDecryptOnly, 1);

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

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

+ .WillOnce(RunCallback<2>(true));

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

SelectDecoder();

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

InitializeDecoderSelector(kDecryptOnly, 2);

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

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

+ .WillOnce(RunCallback<2>(false));

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

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

+ .WillOnce(RunCallback<2>(true));

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

SelectDecoder();

@@ -334,7 +334,7 @@ TEST_F(VideoDecoderSelectorTest,

InitializeDecoderSelector(kDecryptOnly, 2);

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

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

+ .WillOnce(RunCallback<2>(false));

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

SelectDecoderAndDestroy();

« no previous file with comments | « media/filters/opus_audio_decoder.cc ('k') | media/filters/vpx_video_decoder.h » ('j') | no next file with comments »