Merge 23255 - Implemented endofstream callback for media::PipelineImpl....

media/base/video_frame_impl_unittest.cc

Index: media/base/video_frame_impl_unittest.cc
===================================================================
--- media/base/video_frame_impl_unittest.cc	(revision 23335)
+++ media/base/video_frame_impl_unittest.cc	(working copy)
@@ -130,4 +130,46 @@
   EXPECT_TRUE(frame->IsEndOfStream());
 }
 
+TEST(VideoFrameImpl, CreateBlackFrame) {
+  const size_t kWidth = 2;
+  const size_t kHeight = 2;
+  const uint8 kExpectedYRow[] = { 0, 0 };
+  const uint8 kExpectedUVRow[] = { 128 };
+
+  scoped_refptr<media::VideoFrame> frame;
+  VideoFrameImpl::CreateBlackFrame(kWidth, kHeight, &frame);
+  ASSERT_TRUE(frame);
+
+  // Test basic properties.
+  EXPECT_EQ(0, frame->GetTimestamp().InMicroseconds());
+  EXPECT_EQ(0, frame->GetDuration().InMicroseconds());
+  EXPECT_FALSE(frame->IsEndOfStream());
+
+  // Test surface properties.
+  VideoSurface surface;
+  EXPECT_TRUE(frame->Lock(&surface));
+  EXPECT_EQ(VideoSurface::YV12, surface.format);
+  EXPECT_EQ(kWidth, surface.width);
+  EXPECT_EQ(kHeight, surface.height);
+  EXPECT_EQ(3u, surface.planes);
+
+  // Test surfaces themselves.
+  for (size_t y = 0; y < surface.height; ++y) {
+    EXPECT_EQ(0, memcmp(kExpectedYRow, surface.data[VideoSurface::kYPlane],
+                        arraysize(kExpectedYRow)));
+    surface.data[VideoSurface::kYPlane] +=
+        surface.strides[VideoSurface::kYPlane];
+  }
+  for (size_t y = 0; y < surface.height / 2; ++y) {
+    EXPECT_EQ(0, memcmp(kExpectedUVRow, surface.data[VideoSurface::kUPlane],
+                        arraysize(kExpectedUVRow)));
+    EXPECT_EQ(0, memcmp(kExpectedUVRow, surface.data[VideoSurface::kVPlane],
+                        arraysize(kExpectedUVRow)));
+    surface.data[VideoSurface::kUPlane] +=
+        surface.strides[VideoSurface::kUPlane];
+    surface.data[VideoSurface::kVPlane] +=
+        surface.strides[VideoSurface::kVPlane];
+  }
+}
+
 }  // namespace media
Property changes on: media\base\video_frame_impl_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/media/base/video_frame_impl_unittest.cc:r69-2775
   Merged /trunk/src/media/base/video_frame_impl_unittest.cc:r23255