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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/video_decoder_selector_unittest.cc

Issue 1442933002: media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile errors Created 5 years, 1 month 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/filters/opus_audio_decoder.cc ('k') | media/filters/vpx_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 087661df7db1ddf9d2c0c83c46e5be09cb93572b..27968456691f62105a1ce24204a9fa36fe4ec002 100644
--- a/media/filters/video_decoder_selector_unittest.cc
+++ b/media/filters/video_decoder_selector_unittest.cc
@@ -205,8 +205,8 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
SelectDecoder();
@@ -217,7 +217,7 @@ TEST_F(VideoDecoderSelectorTest,
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -228,10 +228,10 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
SelectDecoder();
@@ -242,9 +242,9 @@ TEST_F(VideoDecoderSelectorTest,
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -255,8 +255,8 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_HasDecryptor) {
UseClearStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
SelectDecoder();
@@ -266,7 +266,7 @@ TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_HasDecryptor) {
UseClearStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -277,8 +277,8 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_NoDecryptor_OneClearDecoder) {
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull()));
SelectDecoder();
@@ -289,7 +289,7 @@ TEST_F(VideoDecoderSelectorTest,
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -300,10 +300,10 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_NoDecryptor_MultipleDecoders) {
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
SelectDecoder();
@@ -314,9 +314,9 @@ TEST_F(VideoDecoderSelectorTest,
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -348,8 +348,8 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {
// Since we use DecryptingDemuxerStream, the decoder will be initialized with
// a clear config.
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
SelectDecoder();
@@ -360,7 +360,7 @@ TEST_F(VideoDecoderSelectorTest,
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -373,10 +373,10 @@ TEST_F(VideoDecoderSelectorTest,
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));
SelectDecoder();
@@ -387,9 +387,9 @@ TEST_F(VideoDecoderSelectorTest,
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _, _));
SelectDecoderAndDestroy();
}
@@ -407,8 +407,8 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptAndDecode) {
#else
// A DecryptingDemuxerStream will be created. The clear decoder will be
// initialized and returned.
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+ .WillOnce(RunCallback<3>(true));
EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull()));
#endif
« no previous file with comments | « media/filters/opus_audio_decoder.cc ('k') | media/filters/vpx_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698