diff options
Diffstat (limited to 'www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc')
| -rw-r--r-- | www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index a3c666cca659..1852a3b25f3a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc -@@ -52,7 +52,7 @@ static std::string StorageTypeToString( +@@ -57,7 +57,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 -@@ -67,7 +67,7 @@ static std::string StorageTypeToString( +@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -186,7 +186,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // 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 -@@ -204,7 +204,7 @@ class VideoFrame::DmabufHolder +@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -510,7 +510,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva +@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,17 +45,17 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -642,7 +642,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK(frame.dmabuf_fds_); + DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_; -@@ -960,7 +960,7 @@ size_t VideoFrame::shared_memory_offset() const { - return shared_memory_offset_; + 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) @@ -63,10 +63,10 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1112,7 +1112,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -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), - shared_memory_offset_(0), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), |