media: preparation for recycle buffer.

1. add ffmpeg_video_allocator.cc/h
2. add omx_bufferheader type and av_frame type of video_frame.

please see http://codereview.chromium.org/2992002/show
for full commit. this is used to split that change to reviewable size of changelist.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=53348

Review URL: http://codereview.chromium.org/3006001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53418 0039d316-1c4b-4281-b951-d872f2087c98

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.