diff options
Diffstat (limited to 'www/iridium/files/patch-media_base_video__frame.cc')
-rw-r--r-- | www/iridium/files/patch-media_base_video__frame.cc | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc deleted file mode 100644 index 430d0f3c5bb5..000000000000 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ /dev/null @@ -1,74 +0,0 @@ ---- media/base/video_frame.cc.orig 2019-12-16 21:50:49 UTC -+++ media/base/video_frame.cc -@@ -57,7 +57,7 @@ std::string VideoFrame::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 -@@ -74,7 +74,7 @@ std::string VideoFrame::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 && -@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo - return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and - // thus to have several VideoFrames share the same set of DMABUF FDs. - class VideoFrame::DmabufHolder -@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder - friend class base::RefCountedThreadSafe<DmabufHolder>; - ~DmabufHolder() = default; - }; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - // static - bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM - return frame; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // static - scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( - const VideoFrameLayout& layout, -@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( - } - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK(frame->dmabuf_fds_); - // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const - : mailbox_holders_[texture_index]; - } - --#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); - -@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, - storage_type_(storage_type), - visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), - natural_size_(natural_size), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), - #endif - timestamp_(timestamp), |