aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_base_video__frame.h
diff options
context:
space:
mode:
authorMatthias Wolf <freebsd@rheinwolf.de>2021-10-19 19:33:45 +0000
committerRene Ladan <rene@FreeBSD.org>2021-10-19 19:39:45 +0000
commit336f302a55ad11465a4255ae250715b962639010 (patch)
treec3e9a3cf7406fdf5fdb0ab3c60d132043615c2d7 /www/chromium/files/patch-media_base_video__frame.h
parent6996a61924c2899cf68683451707bbed5d6b9794 (diff)
downloadports-336f302a55ad11465a4255ae250715b962639010.tar.gz
ports-336f302a55ad11465a4255ae250715b962639010.zip
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.h')
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 5b8e1ce39807..18e2c7c931c3 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig 2021-07-19 18:45:18 UTC
+--- media/base/video_frame.h.orig 2021-09-24 04:26:08 UTC
+++ media/base/video_frame.h
@@ -39,9 +39,9 @@
#include "base/mac/scoped_cftyperef.h"
@@ -21,8 +21,8 @@
// 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
-@@ -263,7 +263,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
- ReleaseMailboxCB mailbox_holder_release_cb,
+@@ -268,7 +268,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+ ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
base::TimeDelta timestamp);
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -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
-@@ -519,7 +519,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -527,7 +527,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
-@@ -718,7 +718,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -734,7 +734,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_;