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

Unified Diff: media/base/video_decoder_config_unittest.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ddorwin comments Created 4 years, 10 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/base/video_decoder_config_unittest.cc
diff --git a/media/base/video_decoder_config_unittest.cc b/media/base/video_decoder_config_unittest.cc
index 7885c8f71703e784afec9bc87adada5b6dad5a9b..ca7f248d28fe6bcb9ee76a042303e3886d5cc1e4 100644
--- a/media/base/video_decoder_config_unittest.cc
+++ b/media/base/video_decoder_config_unittest.cc
@@ -19,7 +19,7 @@ TEST(VideoDecoderConfigTest, Invalid_UnsupportedPixelFormat) {
VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
PIXEL_FORMAT_UNKNOWN, COLOR_SPACE_UNSPECIFIED,
kCodedSize, kVisibleRect, kNaturalSize,
- EmptyExtraData(), false);
+ EmptyExtraData(), EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -27,7 +27,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorZero) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 0, 1);
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -35,7 +36,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorZero) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, 0);
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -43,7 +45,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorNegative) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), -1, 1);
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -51,7 +54,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorNegative) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, -1);
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -61,7 +65,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorTooLarge) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), num, 1);
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}
@@ -72,7 +77,8 @@ TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorTooLarge) {
EXPECT_EQ(0, natural_size.width());
VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
- natural_size, EmptyExtraData(), false);
+ natural_size, EmptyExtraData(),
+ EncryptionScheme::Unencrypted());
EXPECT_FALSE(config.IsValidConfig());
}

Powered by Google App Engine
This is Rietveld 408576698