mirror of
https://git.freebsd.org/ports.git
synced 2025-05-07 19:30:46 -04:00
62f8db7809
Changelog: - https://github.com/electron/electron/releases/tag/v35.1.5 - https://github.com/electron/electron/releases/tag/v35.2.0 Reported by: GitHub (watch releases)
47 lines
2.1 KiB
C++
47 lines
2.1 KiB
C++
--- media/base/video_frame.cc.orig 2025-04-14 21:12:04 UTC
|
|
+++ media/base/video_frame.cc
|
|
@@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString(
|
|
return "OWNED_MEMORY";
|
|
case VideoFrame::STORAGE_SHMEM:
|
|
return "SHMEM";
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
case VideoFrame::STORAGE_DMABUFS:
|
|
return "DMABUFS";
|
|
#endif
|
|
@@ -106,7 +106,7 @@ bool VideoFrame::IsStorageTypeMappable(VideoFrame::Sto
|
|
// static
|
|
bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
|
|
return
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// This is not strictly needed but makes explicit that, at VideoFrame
|
|
// level, DmaBufs are not mappable from userspace.
|
|
storage_type != VideoFrame::STORAGE_DMABUFS &&
|
|
@@ -420,7 +420,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII
|
|
plane_size.width() * VideoFrame::BytesPerElement(*format, plane);
|
|
}
|
|
uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
bool is_native_buffer =
|
|
gpu_memory_buffer
|
|
? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER)
|
|
@@ -938,7 +938,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
|
|
return frame;
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// static
|
|
scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
|
|
const VideoFrameLayout& layout,
|
|
@@ -1623,7 +1623,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar
|
|
return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_;
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
size_t VideoFrame::NumDmabufFds() const {
|
|
if (wrapped_frame_) {
|
|
return wrapped_frame_->NumDmabufFds();
|