mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 19:50:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
--- media/base/video_frame.cc.orig 2019-03-11 22:00:59 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 &&
|
|
@@ -461,7 +461,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,
|
|
@@ -592,7 +592,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_);
|
|
@@ -917,7 +917,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);
|
|
|