diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
| commit | 8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch) | |
| tree | c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-media_base_video__frame.cc | |
| parent | multimedia/libva-intel-driver: update to 2.4.1 (diff) | |
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reviewed by: rene
Approved by: chromium@ (rene)
Obtained from: https://github.com/gliaskos/freebsd-chromium
MFH: 2020Q2
Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html
Differential Revision: https://reviews.freebsd.org/D25102
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.cc')
| -rw-r--r-- | www/chromium/files/patch-media_base_video__frame.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 430d0f3c5bb5..8e84e08c288c 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2019-12-16 21:50:49 UTC +--- media/base/video_frame.cc.orig 2020-05-13 18:39:45 UTC +++ media/base/video_frame.cc @@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -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 && -@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -259,7 +259,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 -@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder +@@ -277,7 +277,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -590,7 +590,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -726,7 +726,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ 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 +@@ -1059,7 +1059,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1142,7 +1142,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), |