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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 418193003: Using PROFILE_ANY for vp8 and vp9 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/formats/webm/webm_video_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index c3fde2700bdfbee02bf06b50a99a272c1d3fb310..18013bd3cc789dcf920a6f07fee61aad6043aafd 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -242,37 +242,57 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) {
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorZero) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 0, 1);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorZero) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, 0);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorNegative) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), -1, 1);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorNegative) {
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, -1);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
@@ -280,20 +300,30 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorTooLarge) {
int width = kVisibleRect.size().width();
int num = ceil(static_cast<double>(limits::kMaxDimension + 1) / width);
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), num, 1);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorTooLarge) {
int den = kVisibleRect.size().width() + 1;
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, den);
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN,
+ VideoDecoderConfig config(kCodecVP8,
+ VP8PROFILE_ANY,
kVideoFormat,
- kCodedSize, kVisibleRect, natural_size,
- NULL, 0, false);
+ kCodedSize,
+ kVisibleRect,
+ natural_size,
+ NULL,
+ 0,
+ false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
}
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/formats/webm/webm_video_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698