summaryrefslogtreecommitdiffstats
path: root/media/base/video_frame_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/base/video_frame_unittest.cc')
-rw-r--r--media/base/video_frame_unittest.cc26
1 files changed, 4 insertions, 22 deletions
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index df407b5..633ccc0 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -176,35 +176,17 @@ 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<media::VideoFrame> 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<uint8> memory(new uint8[1]);
scoped_refptr<media::VideoFrame> frame;
uint8* data[3] = {memory.get(), NULL, NULL};
int strides[3] = {1, 0, 0};
- VideoFrame::CreateFrameExternal(media::VideoFrame::RGB32, 0, 0,
+ VideoFrame::CreateFrameExternal(media::VideoFrame::TYPE_SYSTEM_MEMORY,
+ media::VideoFrame::RGB32, 0, 0, 3,
data, strides,
- base::TimeDelta(), base::TimeDelta(), &frame);
+ base::TimeDelta(), base::TimeDelta(),
+ NULL, &frame);
ASSERT_TRUE(frame);
// Test frame properties.