Remove OmxSink interface because Buffer Allocation will go through Allocator in the future, and all allocation required parameters will be passed to "Allocator factory" during intiailized phase of render/decoder.

Remove OMX_BUFFERHEADERTYPE merge logic, this is based on assumptions that all vendor will use one frame per buffer scheme instead of one slice(multiple rows) per buffer which is specified by OpenMAX IL Spec.

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

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

1 files changed, 9 insertions, 1 deletions

diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 5341c16..0ad0628 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -36,6 +36,12 @@ class VideoFrame : public StreamSample {
     EMPTY,       // An empty frame.
   };
 
+  enum BufferType {
+    TYPE_SYSTEM_MEMORY,
+    TYPE_OMX_BUFFER_HEAD,
+    TYPE_EGL_IMAGE,
+  };
+
  public:
   // Creates a new frame with given parameters. Buffers for the frame are
   // allocated but not initialized.
@@ -55,6 +61,8 @@ class VideoFrame : public StreamSample {
   static void CreateBlackFrame(int width, int height,
                                scoped_refptr<VideoFrame>* frame_out);
 
+  virtual BufferType type() const { return TYPE_SYSTEM_MEMORY; }
+
   Format format() const { return format_; }
 
   size_t width() const { return width_; }
@@ -80,7 +88,7 @@ class VideoFrame : public StreamSample {
     repeat_count_ = repeat_count;
   }
 
- private:
+ protected:
   // Clients must use the static CreateFrame() method to create a new frame.
   VideoFrame(Format format,
              size_t video_width,