mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
webrtc/modules/desktop_capture/desktop_frame_unittest.cc
Mirko Bonadei 317a1f09ed Use std::make_unique instead of absl::make_unique. 
WebRTC is now using C++14 so there is no need to use the Abseil version
of std::make_unique.

This CL has been created with the following steps:

git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt
git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt
git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt

diff --new-line-format="" --unchanged-line-format="" \
  /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \
  uniq > /tmp/only_make_unique.txt
diff --new-line-format="" --unchanged-line-format="" \
  /tmp/only_make_unique.txt /tmp/memory.txt | \
  xargs grep -l "absl/memory" > /tmp/add-memory.txt

git grep -l "\babsl::make_unique\b" | \
  xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g"

git checkout PRESUBMIT.py abseil-in-webrtc.md

cat /tmp/add-memory.txt | \
  xargs sed -i \
  's/#include "absl\/memory\/memory.h"/#include <memory>/g'
git cl format
# Manual fix order of the new inserted #include <memory>

cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \
  xargs sed -i '/#include "absl\/memory\/memory.h"/d'

git ls-files | grep BUILD.gn | \
  xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d'

python tools_webrtc/gn_check_autofix.py \
  -m tryserver.webrtc -b linux_rel

# Repead the gn_check_autofix step for other platforms

git ls-files | grep BUILD.gn | \
  xargs sed -i 's/absl\/memory:memory/absl\/memory/g'
git cl format

Bug: webrtc:10945
Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29209}
2019-09-17 15:47:29 +00:00

336 lines
9.1 KiB
C++
Raw Blame History

/*
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/desktop_capture/desktop_frame.h"
#include <memory>
#include "modules/desktop_capture/desktop_region.h"
#include "modules/desktop_capture/test_utils.h"
#include "rtc_base/arraysize.h"
#include "test/gtest.h"
namespace webrtc {
namespace {
std::unique_ptr<DesktopFrame> CreateTestFrame(DesktopRect rect,
int pixels_value) {
DesktopSize size = rect.size();
auto frame = std::make_unique<BasicDesktopFrame>(size);
frame->set_top_left(rect.top_left());
memset(frame->data(), pixels_value, frame->stride() * size.height());
return frame;
}
struct TestData {
const char* description;
DesktopRect dest_frame_rect;
DesktopRect src_frame_rect;
double horizontal_scale;
double vertical_scale;
DesktopRect expected_overlap_rect;
};
void RunTest(const TestData& test) {
// Copy a source frame with all bits set into a dest frame with none set.
auto dest_frame = CreateTestFrame(test.dest_frame_rect, 0);
auto src_frame = CreateTestFrame(test.src_frame_rect, 0xff);
dest_frame->CopyIntersectingPixelsFrom(
*src_frame, test.horizontal_scale, test.vertical_scale);
// Translate the expected overlap rect to be relative to the dest frame/rect.
DesktopVector dest_frame_origin = test.dest_frame_rect.top_left();
DesktopRect relative_expected_overlap_rect = test.expected_overlap_rect;
relative_expected_overlap_rect.Translate(-dest_frame_origin.x(),
-dest_frame_origin.y());
// Confirm bits are now set in the dest frame if & only if they fall in the
// expected range.
for (int y = 0; y < dest_frame->size().height(); ++y) {
SCOPED_TRACE(y);
for (int x = 0; x < dest_frame->size().width(); ++x) {
SCOPED_TRACE(x);
DesktopVector point(x, y);
uint8_t* data = dest_frame->GetFrameDataAtPos(point);
uint32_t pixel_value = *reinterpret_cast<uint32_t*>(data);
bool was_copied = pixel_value == 0xffffffff;
ASSERT_TRUE(was_copied || pixel_value == 0);
bool expected_to_be_copied =
relative_expected_overlap_rect.Contains(point);
ASSERT_EQ(was_copied, expected_to_be_copied);
}
}
}
void RunTests(const TestData* tests, int num_tests) {
for (int i = 0; i < num_tests; i++) {
const TestData& test = tests[i];
SCOPED_TRACE(test.description);
RunTest(test);
}
}
} // namespace
TEST(DesktopFrameTest, CopyIntersectingPixelsMatchingRects) {
const TestData tests[] = {
{"0 origin",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 2, 2)},
{"Negative origin",
DesktopRect::MakeXYWH(-1, -1, 2, 2),
DesktopRect::MakeXYWH(-1, -1, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(-1, -1, 2, 2)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsMatchingRectsScaled) {
// The scale factors shouldn't affect matching rects (they're only applied
// to any difference between the origins)
const TestData tests[] = {
{"0 origin 2x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 2, 2),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 0, 2, 2)},
{"0 origin 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 2, 2),
0.5, 0.5,
DesktopRect::MakeXYWH(0, 0, 2, 2)},
{"Negative origin 2x",
DesktopRect::MakeXYWH(-1, -1, 2, 2),
DesktopRect::MakeXYWH(-1, -1, 2, 2),
2.0, 2.0,
DesktopRect::MakeXYWH(-1, -1, 2, 2)},
{"Negative origin 0.5x",
DesktopRect::MakeXYWH(-1, -1, 2, 2),
DesktopRect::MakeXYWH(-1, -1, 2, 2),
0.5, 0.5,
DesktopRect::MakeXYWH(-1, -1, 2, 2)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsFullyContainedRects) {
const TestData tests[] = {
{"0 origin top left",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 1, 1),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 1, 1)},
{"0 origin bottom right",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(1, 1, 1, 1),
1.0, 1.0,
DesktopRect::MakeXYWH(1, 1, 1, 1)},
{"Negative origin bottom left",
DesktopRect::MakeXYWH(-1, -1, 2, 2),
DesktopRect::MakeXYWH(-1, 0, 1, 1),
1.0, 1.0,
DesktopRect::MakeXYWH(-1, 0, 1, 1)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsFullyContainedRectsScaled) {
const TestData tests[] = {
{"0 origin top left 2x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 1, 1),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 0, 1, 1)},
{"0 origin top left 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 0, 1, 1),
0.5, 0.5,
DesktopRect::MakeXYWH(0, 0, 1, 1)},
{"0 origin bottom left 2x",
DesktopRect::MakeXYWH(0, 0, 4, 4),
DesktopRect::MakeXYWH(1, 1, 2, 2),
2.0, 2.0,
DesktopRect::MakeXYWH(2, 2, 2, 2)},
{"0 origin bottom middle 2x/1x",
DesktopRect::MakeXYWH(0, 0, 4, 3),
DesktopRect::MakeXYWH(1, 1, 2, 2),
2.0, 1.0,
DesktopRect::MakeXYWH(2, 1, 2, 2)},
{"0 origin middle 0.5x",
DesktopRect::MakeXYWH(0, 0, 3, 3),
DesktopRect::MakeXYWH(2, 2, 1, 1),
0.5, 0.5,
DesktopRect::MakeXYWH(1, 1, 1, 1)},
{"Negative origin bottom left 2x",
DesktopRect::MakeXYWH(-1, -1, 3, 3),
DesktopRect::MakeXYWH(-1, 0, 1, 1),
2.0, 2.0,
DesktopRect::MakeXYWH(-1, 1, 1, 1)},
{"Negative origin near middle 0.5x",
DesktopRect::MakeXYWH(-2, -2, 2, 2),
DesktopRect::MakeXYWH(0, 0, 1, 1),
0.5, 0.5,
DesktopRect::MakeXYWH(-1, -1, 1, 1)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsPartiallyContainedRects) {
const TestData tests[] = {
{"Top left",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-1, -1, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 1, 1)},
{"Top right",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(1, -1, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(1, 0, 1, 1)},
{"Bottom right",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(1, 1, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(1, 1, 1, 1)},
{"Bottom left",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-1, 1, 2, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 1, 1, 1)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsPartiallyContainedRectsScaled) {
const TestData tests[] = {
{"Top left 2x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-1, -1, 3, 3),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 0, 1, 1)},
{"Top right 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(2, -2, 2, 2),
0.5, 0.5,
DesktopRect::MakeXYWH(1, 0, 1, 1)},
{"Bottom right 2x",
DesktopRect::MakeXYWH(0, 0, 3, 3),
DesktopRect::MakeXYWH(-1, 1, 3, 3),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 2, 1, 1)},
{"Bottom left 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-2, 2, 2, 2),
0.5, 0.5,
DesktopRect::MakeXYWH(0, 1, 1, 1)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsUncontainedRects) {
const TestData tests[] = {
{"Left",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-1, 0, 1, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Top",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, -1, 2, 1),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Right",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(2, 0, 1, 2),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Bottom",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 2, 2, 1),
1.0, 1.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)}
};
RunTests(tests, arraysize(tests));
}
TEST(DesktopFrameTest, CopyIntersectingPixelsUncontainedRectsScaled) {
const TestData tests[] = {
{"Left 2x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(-1, 0, 2, 2),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Top 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, -2, 2, 1),
0.5, 0.5,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Right 2x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(1, 0, 1, 2),
2.0, 2.0,
DesktopRect::MakeXYWH(0, 0, 0, 0)},
{"Bottom 0.5x",
DesktopRect::MakeXYWH(0, 0, 2, 2),
DesktopRect::MakeXYWH(0, 4, 2, 1),
0.5, 0.5,
DesktopRect::MakeXYWH(0, 0, 0, 0)}
};
RunTests(tests, arraysize(tests));
}
} // namespace webrtc
Reference in a new issue View git blame Copy permalink