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 | 12 |
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 68b0710d80ba..5b8e1ce39807 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 2021-05-12 22:05:55 UTC +--- media/base/video_frame.h.orig 2021-07-19 18:45:18 UTC +++ media/base/video_frame.h -@@ -40,9 +40,9 @@ +@@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ namespace gfx { class GpuMemoryBuffer; -@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -81,7 +81,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 -@@ -259,7 +259,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -263,7 +263,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 -@@ -515,7 +515,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -519,7 +519,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 -@@ -697,7 +697,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -718,7 +718,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_; |