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 9743f58488af0b37588f7fcb7ad863b3882f4fc8..5b00a6e876bebf270a3105632671593a490b0618 100644 |
--- a/media/filters/video_decoder_selector_unittest.cc |
+++ b/media/filters/video_decoder_selector_unittest.cc |
@@ -40,6 +40,9 @@ MATCHER(ClearConfig, "") { |
namespace media { |
+const char kDecoder1[] = "Decoder1"; |
+const char kDecoder2[] = "Decoder2"; |
+ |
class VideoDecoderSelectorTest : public ::testing::Test { |
public: |
enum DecryptorCapability { |
@@ -53,8 +56,8 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
: traits_(&media_log_), |
demuxer_stream_( |
new StrictMock<MockDemuxerStream>(DemuxerStream::VIDEO)), |
- decoder_1_(new StrictMock<MockVideoDecoder>()), |
- decoder_2_(new StrictMock<MockVideoDecoder>()) { |
+ decoder_1_(new StrictMock<MockVideoDecoder>(kDecoder1)), |
+ decoder_2_(new StrictMock<MockVideoDecoder>(kDecoder2)) { |
all_decoders_.push_back(decoder_1_); |
all_decoders_.push_back(decoder_2_); |
// |cdm_context_| and |decryptor_| are conditionally created in |
@@ -81,6 +84,10 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
TestVideoConfig::NormalEncrypted()); |
} |
+ ScopedVector<VideoDecoder> CreateVideoDecodersForTest() { |
+ return std::move(all_decoders_); |
+ } |
+ |
void InitializeDecoderSelector(DecryptorCapability decryptor_capability, |
int num_decoders) { |
if (decryptor_capability != kNoCdm) { |
@@ -104,12 +111,18 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
all_decoders_.begin() + num_decoders, all_decoders_.end()); |
decoder_selector_.reset(new VideoDecoderSelector( |
- message_loop_.task_runner(), std::move(all_decoders_), &media_log_)); |
+ message_loop_.task_runner(), |
+ base::Bind(&VideoDecoderSelectorTest::CreateVideoDecodersForTest, |
+ base::Unretained(this)), |
+ &media_log_)); |
} |
- void SelectDecoder() { |
+ void SelectDecoder() { SelectDecoderWithBlacklist(""); } |
+ |
+ void SelectDecoderWithBlacklist(const std::string& blacklisted_decoder) { |
decoder_selector_->SelectDecoder( |
&traits_, demuxer_stream_.get(), cdm_context_.get(), |
+ blacklisted_decoder, |
base::Bind(&VideoDecoderSelectorTest::MockOnDecoderSelected, |
base::Unretained(this)), |
base::Bind(&VideoDecoderSelectorTest::FrameReady, |
@@ -163,18 +176,22 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
DISALLOW_COPY_AND_ASSIGN(VideoDecoderSelectorTest); |
}; |
-// Tests for clear streams. |
+// Tests for clear streams. CDM will not be used for clear streams so |
+// DecryptorCapability doesn't really matter. |
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_NoClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, ClearStream_NoClearDecoder) { |
UseClearStream(); |
- InitializeDecoderSelector(kNoDecryptor, 0); |
+ |
+ // DecoderSelector will not try decrypting decoders for clear stream, even |
+ // if the CDM is capable of doing decrypt and decode. |
+ InitializeDecoderSelector(kDecryptAndDecode, 0); |
EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull())); |
SelectDecoder(); |
} |
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_OneClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, ClearStream_OneClearDecoder) { |
UseClearStream(); |
InitializeDecoderSelector(kNoCdm, 1); |
@@ -185,7 +202,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_OneClearDecoder) { |
SelectDecoder(); |
} |
-TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_NoCdm_OneClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_OneClearDecoder) { |
UseClearStream(); |
InitializeDecoderSelector(kNoCdm, 1); |
@@ -194,7 +211,7 @@ TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_NoCdm_OneClearDecoder) { |
SelectDecoderAndDestroy(); |
} |
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_MultipleClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, ClearStream_MultipleClearDecoder) { |
UseClearStream(); |
InitializeDecoderSelector(kNoCdm, 2); |
@@ -207,8 +224,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_MultipleClearDecoder) { |
SelectDecoder(); |
} |
-TEST_F(VideoDecoderSelectorTest, |
- Destroy_ClearStream_NoCdm_MultipleClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_MultipleClearDecoder) { |
UseClearStream(); |
InitializeDecoderSelector(kNoCdm, 2); |
@@ -219,90 +235,16 @@ TEST_F(VideoDecoderSelectorTest, |
SelectDecoderAndDestroy(); |
} |
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) { |
+TEST_F(VideoDecoderSelectorTest, ClearStream_BlackListedDecoder) { |
watk
2017/05/04 21:35:32
Here and another one below: s/BlackListed/Blacklis
|
UseClearStream(); |
- InitializeDecoderSelector(kNoDecryptor, 1); |
- |
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _)) |
- .WillOnce(RunCallback<3>(false)); |
- EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull())); |
- |
- SelectDecoder(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, |
- Destroy_ClearStream_NoDecryptor_OneClearDecoder) { |
- UseClearStream(); |
- InitializeDecoderSelector(kNoDecryptor, 1); |
- |
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _)); |
- |
- SelectDecoderAndDestroy(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) { |
- UseClearStream(); |
- InitializeDecoderSelector(kNoDecryptor, 2); |
+ InitializeDecoderSelector(kNoCdm, 2); |
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _)) |
- .WillOnce(RunCallback<3>(false)); |
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _)) |
+ // Decoder 1 is blacklisted and will not even be tried. |
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _, _)) |
.WillOnce(RunCallback<3>(true)); |
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull())); |
- SelectDecoder(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, |
- Destroy_ClearStream_NoDecryptor_MultipleClearDecoder) { |
- UseClearStream(); |
- InitializeDecoderSelector(kNoDecryptor, 2); |
- |
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _)) |
- .WillOnce(RunCallback<3>(false)); |
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _)); |
- |
- SelectDecoderAndDestroy(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, ClearStream_DecryptOnly) { |
- UseClearStream(); |
- InitializeDecoderSelector(kDecryptOnly, 1); |
- |
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _)) |
- .WillOnce(RunCallback<3>(true)); |
- EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull())); |
- |
- SelectDecoder(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_DecryptOnly) { |
- UseClearStream(); |
- InitializeDecoderSelector(kDecryptOnly, 1); |
- |
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _)); |
- |
- SelectDecoderAndDestroy(); |
-} |
- |
-TEST_F(VideoDecoderSelectorTest, ClearStream_DecryptAndDecode) { |
- UseClearStream(); |
- InitializeDecoderSelector(kDecryptAndDecode, 1); |
- |
-#if !defined(OS_ANDROID) |
- // A DecryptingVideoDecoder will be created and selected. The clear decoder |
- // should not be touched at all. No DecryptingDemuxerStream should be |
- // created. |
- EXPECT_CALL(*this, OnDecoderSelected(NotNull(), IsNull())); |
-#else |
- // A DecryptingDemuxerStream will be created. The clear decoder will be |
- // initialized and returned. |
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _)) |
- .WillOnce(RunCallback<3>(true)); |
- EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull())); |
-#endif |
- |
- SelectDecoder(); |
+ SelectDecoderWithBlacklist(kDecoder1); |
} |
// Tests for encrypted streams. |
@@ -431,4 +373,48 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptAndDecode) { |
SelectDecoder(); |
} |
+TEST_F(VideoDecoderSelectorTest, |
+ EncryptedStream_NoDecryptor_BlackListedDecoder) { |
+ UseEncryptedStream(); |
+ InitializeDecoderSelector(kNoDecryptor, 2); |
+ |
+ EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _)) |
+ .WillOnce(RunCallback<3>(true)); |
+ EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull())); |
+ |
+ SelectDecoderWithBlacklist(kDecoder1); |
+} |
+ |
+TEST_F(VideoDecoderSelectorTest, |
+ EncryptedStream_DecryptOnly_BlackListedDecoder) { |
+ UseEncryptedStream(); |
+ InitializeDecoderSelector(kDecryptOnly, 2); |
+ |
+ // When DecryptingDemuxerStream is chosen, the blacklist is ignored. |
+ 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())); |
+ |
+ SelectDecoderWithBlacklist(kDecoder2); |
+} |
+ |
+TEST_F(VideoDecoderSelectorTest, |
+ EncryptedStream_DecryptAndDecode_BlackListedDecoder) { |
+ UseEncryptedStream(); |
+ InitializeDecoderSelector(kDecryptAndDecode, 2); |
+ |
+ // DecryptingAudioDecoder is blacklisted so we'll fallback to use |
+ // DecryptingDemuxerStream to do decrypt-only. |
+ 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())); |
+ |
+ // TODO(xhwang): Avoid the hardcoded string here. |
+ SelectDecoderWithBlacklist("DecryptingVideoDecoder"); |
+} |
+ |
} // namespace media |