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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 11269017: Plumb through cropped output size for VideoFrame (Closed) Base URL: https://git.chromium.org/git/chromium/src@git-svn
Patch Set: Found the windows failure, and fixed it. Thanks akalin@ Created 8 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/ffmpeg_video_decoder.cc ('k') | media/filters/gpu_video_decoder.h » ('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 9d9c24d1c38725118cc5a41dbf7162d4d7d0ccd7..52e02d247f77a613de7b8c2ea4f03198edfe1523 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -218,10 +218,12 @@ class FFmpegVideoDecoderTest : public testing::Test {
EXPECT_EQ(VideoDecoder::kOk, status_b);
ASSERT_TRUE(video_frame_a);
ASSERT_TRUE(video_frame_b);
- EXPECT_EQ(original_size.width(), video_frame_a->data_size().width());
- EXPECT_EQ(original_size.height(), video_frame_a->data_size().height());
- EXPECT_EQ(expected_width, video_frame_b->data_size().width());
- EXPECT_EQ(expected_height, video_frame_b->data_size().height());
+ EXPECT_EQ(original_size.width(),
+ video_frame_a->visible_rect().size().width());
+ EXPECT_EQ(original_size.height(),
+ video_frame_a->visible_rect().size().height());
+ EXPECT_EQ(expected_width, video_frame_b->visible_rect().size().width());
+ EXPECT_EQ(expected_height, video_frame_b->visible_rect().size().height());
}
void Read(VideoDecoder::Status* status,
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698