diff options
author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
---|---|---|
committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
commit | ab34cf48c6364f23214d9242e83eefd174f7f820 (patch) | |
tree | ce7704d873ee687272322780c46fc9ddee28a619 /www/chromium/files/patch-media_base_video__frame.h | |
parent | 8b8ed1280fd0f67a28315ef6868ea74d951179ee (diff) | |
download | ports-ab34cf48c6364f23214d9242e83eefd174f7f820.tar.gz ports-ab34cf48c6364f23214d9242e83eefd174f7f820.zip |
www/chromium: Update to 71.0.3578.98
Changelog: https://chromium.googlesource.com/chromium/src/+log/68.0.3440.106..71.0.3578.98?pretty=fuller&n=10000
PR: 233990
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reported by: nikolaibitinit@gmail.com
Reviewed by: rene, cpm
Approved by: rene, cpm
MFH: 2019Q1
Security: http://vuxml.freebsd.org/freebsd/546d4dd4-10ea-11e9-b407-080027ef1a23.html
Security: http://vuxml.freebsd.org/freebsd/720590df-10eb-11e9-b407-080027ef1a23.html
Notes
Notes:
svn path=/head/; revision=489612
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.h')
-rw-r--r-- | www/chromium/files/patch-media_base_video__frame.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 2bd9d6142dcf..83e9b9c48720 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 2017-06-05 19:03:08 UTC -+++ media/base/video_frame.h -@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +--- media/base/video_frame.h.orig 2018-12-03 21:17:03.000000000 +0100 ++++ media/base/video_frame.h 2018-12-13 23:50:03.082947000 +0100 +@@ -72,7 +72,7 @@ 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. @@ -9,30 +9,30 @@ // 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 +@@ -238,7 +238,7 @@ uint8_t* a_data, base::TimeDelta timestamp); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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 -@@ -338,7 +338,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // (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 +@@ -415,7 +415,7 @@ // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Returns backing DmaBuf file descriptor for given |plane|, if present, or - // -1 if not. - int DmabufFd(size_t plane) const; -@@ -531,7 +531,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - base::SharedMemoryHandle shared_memory_handle_; + // 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 +@@ -625,7 +625,7 @@ + // memory. size_t shared_memory_offset_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Dmabufs for each plane. If set, this frame has DmaBuf backing in some way. - base::ScopedFD dmabuf_fds_[kMaxPlanes]; - #endif + // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either + // equal or less than the number of planes of the frame. If it is less, then + // the memory area represented by the last FD contains the remaining planes. |