sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
846 changed files with 10693 additions and 8131 deletions
|
@ -10,7 +10,7 @@ Index: media/base/video_frame.h
|
|||
#include "base/files/scoped_file.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
|
||||
@@ -110,7 +110,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 read-only shared memory.
|
||||
|
@ -19,7 +19,7 @@ Index: media/base/video_frame.h
|
|||
// 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
|
||||
@@ -316,7 +316,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
|
||||
@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
|
||||
ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
|
||||
base::TimeDelta timestamp);
|
||||
|
||||
|
@ -28,7 +28,7 @@ Index: media/base/video_frame.h
|
|||
// 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
|
||||
@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
|
||||
@@ -593,7 +593,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;
|
||||
|
||||
|
@ -37,7 +37,7 @@ Index: media/base/video_frame.h
|
|||
// 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
|
||||
@@ -814,7 +814,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
|
||||
@@ -811,7 +811,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_;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue