summaryrefslogtreecommitdiff
path: root/devel/electron6/files/patch-media_base_video__frame.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron6/files/patch-media_base_video__frame.cc')
-rw-r--r--devel/electron6/files/patch-media_base_video__frame.cc47
1 files changed, 0 insertions, 47 deletions
diff --git a/devel/electron6/files/patch-media_base_video__frame.cc b/devel/electron6/files/patch-media_base_video__frame.cc
deleted file mode 100644
index 939baf50ecc6..000000000000
--- a/devel/electron6/files/patch-media_base_video__frame.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- media/base/video_frame.cc.orig 2019-09-10 11:14:07 UTC
-+++ media/base/video_frame.cc
-@@ -53,7 +53,7 @@ static std::string StorageTypeToString(
- return "OWNED_MEMORY";
- case VideoFrame::STORAGE_SHMEM:
- return "SHMEM";
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- case VideoFrame::STORAGE_DMABUFS:
- return "DMABUFS";
- #endif
-@@ -68,7 +68,7 @@ static std::string StorageTypeToString(
- // static
- bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
- return
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // This is not strictly needed but makes explicit that, at VideoFrame
- // level, DmaBufs are not mappable from userspace.
- storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -495,7 +495,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
- return frame;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // static
- scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
- const VideoFrameLayout& layout,
-@@ -626,7 +626,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
- }
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // If there are any |dmabuf_fds_| plugged in, we should duplicate them.
- if (frame.storage_type() == STORAGE_DMABUFS) {
- wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame.dmabuf_fds_);
-@@ -950,7 +950,7 @@ size_t VideoFrame::shared_memory_offset() const {
- return shared_memory_offset_;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
- DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
-