sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
846 changed files with 10693 additions and 8131 deletions
|
@ -55,7 +55,7 @@ Index: media/base/video_frame.cc
|
|||
DCHECK(frame->dmabuf_fds_);
|
||||
// If there are any |dmabuf_fds_| plugged in, we should refer them too.
|
||||
wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
|
||||
@@ -1303,7 +1303,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
|
||||
@@ -1309,7 +1309,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
|
||||
: mailbox_holders_[texture_index];
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,7 @@ Index: media/base/video_frame.cc
|
|||
const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
|
||||
DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
|
||||
|
||||
@@ -1416,7 +1416,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
|
||||
@@ -1422,7 +1422,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
|
||||
storage_type_(storage_type),
|
||||
visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
|
||||
natural_size_(natural_size),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue