diff options
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.h')
| -rw-r--r-- | www/chromium/files/patch-media_base_video__frame.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 3f650d9953ce..2bd9d6142dcf 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,15 +1,15 @@ ---- media/base/video_frame.h.orig 2017-04-19 19:06:35 UTC +--- media/base/video_frame.h.orig 2017-06-05 19:03:08 UTC +++ media/base/video_frame.h -@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public b +@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // TODO(mcasas): Consider turning this type into STORAGE_NATIVE or another - // meaningful name and handle it appropriately in all cases. - STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. -@@ -186,7 +186,7 @@ class MEDIA_EXPORT VideoFrame : public b + // TODO(mcasas): Consider turning this type into STORAGE_NATIVE + // based on the idea of using this same enum value for both DMA + // buffers on Linux and CVPixelBuffers on Mac (which currently use +@@ -188,7 +188,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,7 +18,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/Documentation/dma-buf-sharing.txt) with a // VideoFrame. The dmabuf fds are dup()ed on creation, so that the VideoFrame -@@ -336,7 +336,7 @@ class MEDIA_EXPORT VideoFrame : public b +@@ -338,7 +338,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; @@ -26,8 +26,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) // Returns backing DmaBuf file descriptor for given |plane|, if present, or // -1 if not. - // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide. -@@ -528,7 +528,7 @@ class MEDIA_EXPORT VideoFrame : public b + int DmabufFd(size_t plane) const; +@@ -531,7 +531,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte base::SharedMemoryHandle shared_memory_handle_; size_t shared_memory_offset_; |