Chromium Code Reviews| Index: media/base/video_frame.h |
| diff --git a/media/base/video_frame.h b/media/base/video_frame.h |
| index ad7f4c01a4268651728ce71acba87c3ec0ac388e..3444f560c2151e91eb537e119c2f7b3cb135ffba 100644 |
| --- a/media/base/video_frame.h |
| +++ b/media/base/video_frame.h |
| @@ -413,9 +413,22 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { |
| // Returns a human-readable string describing |*this|. |
| std::string AsHumanReadableString(); |
| - private: |
| + protected: |
| friend class base::RefCountedThreadSafe<VideoFrame>; |
| + virtual ~VideoFrame(); |
| + |
| + // Clients must use the static factory/wrapping methods to create a new frame. |
| + VideoFrame(VideoPixelFormat format, |
| + StorageType storage_type, |
| + const gfx::Size& coded_size, |
| + const gfx::Rect& visible_rect, |
| + const gfx::Size& natural_size, |
| + base::TimeDelta timestamp); |
| + void set_data(size_t plane, uint8_t* ptr); |
|
magjed_chromium
2016/03/03 14:20:58
I don't like these changes to VideoFrame. Adding s
mcasas
2016/03/03 18:41:15
Actually this is happening in //, see the descript
|
| + void set_stride(size_t plane, int stride); |
| + |
| + private: |
| static scoped_refptr<VideoFrame> WrapExternalStorage( |
| VideoPixelFormat format, |
| StorageType storage_type, |
| @@ -428,13 +441,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { |
| base::SharedMemoryHandle handle, |
| size_t data_offset); |
| - // Clients must use the static factory/wrapping methods to create a new frame. |
| - VideoFrame(VideoPixelFormat format, |
| - StorageType storage_type, |
| - const gfx::Size& coded_size, |
| - const gfx::Rect& visible_rect, |
| - const gfx::Size& natural_size, |
| - base::TimeDelta timestamp); |
| VideoFrame(VideoPixelFormat format, |
| StorageType storage_type, |
| const gfx::Size& coded_size, |
| @@ -451,7 +457,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { |
| const gpu::MailboxHolder(&mailbox_holders)[kMaxPlanes], |
| const ReleaseMailboxCB& mailbox_holder_release_cb, |
| base::TimeDelta timestamp); |
| - virtual ~VideoFrame(); |
| static scoped_refptr<VideoFrame> CreateFrameInternal( |
| VideoPixelFormat format, |