aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_base_video__frame.h
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2021-01-27 21:01:06 +0000
committerRene Ladan <rene@FreeBSD.org>2021-01-27 21:01:06 +0000
commita04e75e95a0d8a508afd0f8a4d1e05b8bca29655 (patch)
treee3b89e99a71056314a4d5efc01905b12186e03cc /www/chromium/files/patch-media_base_video__frame.h
parentbc4938dedbaa6ea1ea782bad080a7bbf4c0fdb9b (diff)
downloadports-a04e75e95a0d8a508afd0f8a4d1e05b8bca29655.tar.gz
ports-a04e75e95a0d8a508afd0f8a4d1e05b8bca29655.zip
Notes
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.h')
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 2bd506c057b4..47fb06e39d1f 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,6 +1,6 @@
---- media/base/video_frame.h.orig 2020-11-13 06:36:44 UTC
+--- media/base/video_frame.h.orig 2021-01-18 21:29:00 UTC
+++ media/base/video_frame.h
-@@ -41,9 +41,9 @@
+@@ -40,9 +40,9 @@
#include "base/mac/scoped_cftyperef.h"
#endif // defined(OS_MAC)
@@ -12,7 +12,7 @@
namespace gfx {
class GpuMemoryBuffer;
-@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -82,7 +82,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, // Backed by unsafe (writable) shared memory.
@@ -21,7 +21,7 @@
// 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
-@@ -260,7 +260,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -259,7 +259,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
ReleaseMailboxCB mailbox_holder_release_cb,
base::TimeDelta timestamp);
@@ -30,7 +30,7 @@
// Wraps provided dmabufs
// (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
// VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -507,7 +507,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -509,7 +509,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// mailbox, the caller must wait for the included sync point.
const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
@@ -39,7 +39,7 @@
// Returns a vector containing the backing DmaBufs for this frame. The number
// of returned DmaBufs will be equal or less than the number of planes of
// the frame. If there are less, this means that the last FD contains the
-@@ -696,7 +696,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -695,7 +695,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;