Commit 0302f6ef authored by Hirokazu Honda's avatar Hirokazu Honda Committed by Commit Bot

VideoFrame unittest: Create a dummy fd for ScopedFD by ScopedFD default ctor in WrapExternalDmabufs

If ScopedFD is initialized with some integer, its dtor will close it as a file
descriptor. Because close will cause an error if there is no file descriptor,
this will fail VideoFrame unittest.
To solve this issue, ScopedFD is initialized without anything (i.e. default
ctor) is called.

BUG=chromium:883249
TEST=media_unittest on linux

Change-Id: If89a59d882fd887e4dc443bfd00153e69e336751
Reviewed-on: https://chromium-review.googlesource.com/1223167
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591286}
parent efabca0c
......@@ -403,11 +403,7 @@ TEST(VideoFrame, WrapExternalDmabufs) {
}
auto timestamp = base::TimeDelta::FromMilliseconds(1);
VideoFrameLayout layout(PIXEL_FORMAT_I420, coded_size, planes, buffer_sizes);
std::vector<int> dummy_fds = {10, 11, 12};
std::vector<base::ScopedFD> dmabuf_fds;
for (int fd : dummy_fds) {
dmabuf_fds.emplace_back(fd);
}
std::vector<base::ScopedFD> dmabuf_fds(3u);
auto frame =
VideoFrame::WrapExternalDmabufs(layout, visible_rect, visible_rect.size(),
std::move(dmabuf_fds), timestamp);
......@@ -423,11 +419,7 @@ TEST(VideoFrame, WrapExternalDmabufs) {
EXPECT_EQ(frame->layout().buffer_sizes()[i], buffer_sizes[i]);
}
EXPECT_TRUE(frame->HasDmaBufs());
const auto& fds = frame->DmabufFds();
EXPECT_EQ(fds.size(), dummy_fds.size());
for (size_t i = 0; i < fds.size(); i++) {
EXPECT_EQ(fds[i].get(), dummy_fds[i]);
}
EXPECT_EQ(frame->DmabufFds().size(), 3u);
EXPECT_EQ(frame->coded_size(), coded_size);
EXPECT_EQ(frame->visible_rect(), visible_rect);
EXPECT_EQ(frame->timestamp(), timestamp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment