From 305ddf7c77a2f082499c584ef00b25cad63654cb Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Thu, 22 Jul 2010 17:29:00 +0000 Subject: Reverting 53348... Broke webkit build. BUG=None TEST=Nont TBR=jiesun Review URL: http://codereview.chromium.org/3015018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53352 0039d316-1c4b-4281-b951-d872f2087c98 --- media/base/video_frame_unittest.cc | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'media/base/video_frame_unittest.cc') diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 633ccc0..df407b5 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -176,17 +176,35 @@ TEST(VideoFrame, CreateBlackFrame) { } } +TEST(VideoFrame, CreatePrivateFrame) { + void* private_buffer = NULL; + const base::TimeDelta kTimestampA = base::TimeDelta::FromMicroseconds(1337); + const base::TimeDelta kDurationA = base::TimeDelta::FromMicroseconds(1667); + + // Create an EGL Frame. + scoped_refptr frame; + VideoFrame::CreatePrivateFrame(media::VideoFrame::TYPE_EGL_IMAGE, + media::VideoFrame::RGBA, 0, 0, + kTimestampA, kDurationA, + private_buffer, &frame); + ASSERT_TRUE(frame); + + // Test |frame| properties. + EXPECT_EQ(media::VideoFrame::TYPE_EGL_IMAGE, frame->type()); + EXPECT_EQ(media::VideoFrame::RGBA, frame->format()); + EXPECT_EQ(private_buffer, frame->private_buffer()); + EXPECT_EQ(NULL, frame->data(VideoFrame::kYPlane)); +} + TEST(VideoFram, CreateExternalFrame) { scoped_array memory(new uint8[1]); scoped_refptr frame; uint8* data[3] = {memory.get(), NULL, NULL}; int strides[3] = {1, 0, 0}; - VideoFrame::CreateFrameExternal(media::VideoFrame::TYPE_SYSTEM_MEMORY, - media::VideoFrame::RGB32, 0, 0, 3, + VideoFrame::CreateFrameExternal(media::VideoFrame::RGB32, 0, 0, data, strides, - base::TimeDelta(), base::TimeDelta(), - NULL, &frame); + base::TimeDelta(), base::TimeDelta(), &frame); ASSERT_TRUE(frame); // Test frame properties. -- cgit v1.1