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

Unified Diff: media/base/video_frame_unittest.cc

Issue 10824141: Remove VideoDecoder::natural_size() & added VideoFrame::natural_size(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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_frame_unittest.cc
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index e1dc1ff0e4816970db5663c160d32b183b2133a4..2f8de6e334ab1d14af6c16f01646834bcca0e8c6 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -49,6 +49,7 @@ void ExpectFrameColor(media::VideoFrame* yv12_frame, uint32 expect_rgb_color) {
rgb_frame = media::VideoFrame::CreateFrame(VideoFrame::RGB32,
yv12_frame->width(),
yv12_frame->height(),
+ yv12_frame->natural_size(),
yv12_frame->GetTimestamp());
ASSERT_EQ(yv12_frame->width(), rgb_frame->width());
@@ -88,7 +89,7 @@ void ExpectFrameExtents(VideoFrame::Format format, int planes,
const base::TimeDelta kTimestamp = base::TimeDelta::FromMicroseconds(1337);
scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
- format, kWidth, kHeight, kTimestamp);
+ format, kWidth, kHeight, gfx::Size(kWidth, kHeight), kTimestamp);
ASSERT_TRUE(frame);
for(int plane = 0; plane < planes; plane++) {
@@ -123,7 +124,7 @@ TEST(VideoFrame, CreateFrame) {
// Create a YV12 Video Frame.
scoped_refptr<media::VideoFrame> frame =
VideoFrame::CreateFrame(media::VideoFrame::YV12, kWidth, kHeight,
- kTimestamp);
+ gfx::Size(kWidth, kHeight), kTimestamp);
ASSERT_TRUE(frame);
// Test VideoFrame implementation.

Powered by Google App Engine
This is Rietveld 408576698