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, 5 insertions, 12 deletions

diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index ddf6644..a135bdf 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -39,7 +39,7 @@ class VideoFrame : public StreamSample {
 
   enum SurfaceType {
     TYPE_SYSTEM_MEMORY,
-    TYPE_OMX_BUFFER_HEAD,
+    TYPE_OMXBUFFERHEAD,
     TYPE_EGL_IMAGE,
   };
 
@@ -56,13 +56,16 @@ class VideoFrame : public StreamSample {
   // Creates a new frame with given parameters. Buffers for the frame are
   // provided externally. Reference to the buffers and strides are copied
   // from |data| and |strides| respectively.
-  static void CreateFrameExternal(Format format,
+  static void CreateFrameExternal(SurfaceType type,
+                                  Format format,
                                   size_t width,
                                   size_t height,
+                                  size_t planes,
                                   uint8* const data[kMaxPlanes],
                                   const int32 strides[kMaxPlanes],
                                   base::TimeDelta timestamp,
                                   base::TimeDelta duration,
+                                  void* private_buffer,
                                   scoped_refptr<VideoFrame>* frame_out);
 
   // Creates a frame with format equals to VideoFrame::EMPTY, width, height
@@ -74,16 +77,6 @@ class VideoFrame : public StreamSample {
   static void CreateBlackFrame(int width, int height,
                                scoped_refptr<VideoFrame>* frame_out);
 
-  // Creates a new frame of |type| with given parameters.
-  static void CreatePrivateFrame(VideoFrame::SurfaceType type,
-                                 VideoFrame::Format format,
-                                 size_t width,
-                                 size_t height,
-                                 base::TimeDelta timestamp,
-                                 base::TimeDelta duration,
-                                 void* private_buffer,
-                                 scoped_refptr<VideoFrame>* frame_out);
-
   virtual SurfaceType type() const { return type_; }
 
   Format format() const { return format_; }