diff options
Diffstat (limited to 'media/base/video_frame.h')
| -rw-r--r-- | media/base/video_frame.h | 17 |
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_; } |