diff options
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.cc')
| -rw-r--r-- | www/chromium/files/patch-media_base_video__frame.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 6ad9519f0f0f..703204f7ea01 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2025-08-07 06:57:29 UTC +--- media/base/video_frame.cc.orig 2025-09-06 10:01:20 UTC +++ media/base/video_frame.cc -@@ -96,7 +96,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -87,7 +87,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -110,7 +110,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -101,7 +101,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,25 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -421,7 +421,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII +@@ -396,7 +396,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForMa 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) -@@ -850,7 +850,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM - return frame; + bool is_native_buffer = !shared_image->IsSharedMemoryForVideoFrame(); + if (is_native_buffer) { + const auto gmb_handle = shared_image->CloneGpuMemoryBufferHandle(); +@@ -861,7 +861,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM } + #endif -#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, -@@ -1541,7 +1541,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1535,7 +1535,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } |