Revert "screen-capture-utils: Add a minimal kmsvnc with graphics only."
This reverts commit 9c60ff8b7753f67b983e9af3e328054a3d165ba7.
Reason for revert: b:176004895
tast.graphics.Smoke.* broken on various boards (cave, lars, sentry)
Original change's description:
> screen-capture-utils: Add a minimal kmsvnc with graphics only.
>
> Input will come later.
>
> BUG=b:174628798
> BUG=b:168259048
> TEST=emerge-rammus-arc-r chromeos-base/screen-capture-utils
>
> Change-Id: I460cc21b2f73486ee893b4640bb744f1da3755d8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2574148
> Tested-by: Junichi Uekawa <uekawa@chromium.org>
> Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
> Reviewed-by: Shao-Chuan Lee <shaochuan@chromium.org>
Bug: b:174628798
Bug: b:168259048
Bug: b:176004895
Cq-Depend: chromium:2597533
Change-Id: Ic13b7d031246e6242b0c28c6b1e401d1a3714716
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2599795
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>
diff --git a/screen-capture-utils/BUILD.gn b/screen-capture-utils/BUILD.gn
index 7795c78..ea0068c 100644
--- a/screen-capture-utils/BUILD.gn
+++ b/screen-capture-utils/BUILD.gn
@@ -5,10 +5,7 @@
import("//common-mk/pkg_config.gni")
group("all") {
- deps = [
- ":kmsvnc",
- ":screenshot",
- ]
+ deps = [ ":screenshot" ]
}
pkg_config("target_defaults") {
@@ -22,33 +19,13 @@
]
}
-static_library("libscreen-capture") {
+executable("screenshot") {
+ configs += [ ":target_defaults" ]
sources = [
"bo_import_capture.cc",
"crtc.cc",
"egl_capture.cc",
- ]
- configs += [ ":target_defaults" ]
-}
-
-pkg_config("libvncserver") {
- pkg_deps = [ "libvncserver" ]
-}
-
-executable("screenshot") {
- configs += [ ":target_defaults" ]
- sources = [
+ "main.cc",
"png.cc",
- "screenshot.cc",
]
- deps = [ ":libscreen-capture" ]
-}
-
-executable("kmsvnc") {
- configs += [
- ":target_defaults",
- ":libvncserver",
- ]
- sources = [ "kmsvnc.cc" ]
- deps = [ ":libscreen-capture" ]
}
diff --git a/screen-capture-utils/README.md b/screen-capture-utils/README.md
index d7860ff..ba46ed0 100644
--- a/screen-capture-utils/README.md
+++ b/screen-capture-utils/README.md
@@ -1,15 +1,4 @@
# screen-capture-utils
-Utilities for screen capturing for dev/test
-images for working with screen capture.
-
-## screenshot
-
-Provides a screenshot of the current display. Useful for capturing what's on the
-display when test has failed, for example. Not all devices are supported yet,
-so your mileage may vary.
-
-## kmsvnc
-
-VNC server using the same infrastructure as screenshot for grabbing display. We
-have tested with VNC client for Chrome.
+Utilities for screen capturing. Provides the `screenshot` command on dev/test
+images for taking screenshots.
diff --git a/screen-capture-utils/kmsvnc.cc b/screen-capture-utils/kmsvnc.cc
deleted file mode 100644
index a82ddd6..0000000
--- a/screen-capture-utils/kmsvnc.cc
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <csignal>
-#include <cstdint>
-#include <memory>
-
-#include <sys/time.h>
-
-#include <base/command_line.h>
-#include <base/logging.h>
-#include <base/strings/string_number_conversions.h>
-
-#include <rfb/rfb.h>
-
-#include "screen-capture-utils/bo_import_capture.h"
-#include "screen-capture-utils/capture.h"
-#include "screen-capture-utils/crtc.h"
-#include "screen-capture-utils/egl_capture.h"
-
-namespace screenshot {
-namespace {
-
-constexpr const char kInternalSwitch[] = "internal";
-constexpr const char kExternalSwitch[] = "external";
-constexpr const char kCrtcIdSwitch[] = "crtc-id";
-
-class ScopedPowerLock {
- public:
- ScopedPowerLock() {
- PCHECK(system("set_power_policy --screen_wake_lock=1") != -1)
- << "Invoking set_power_policy to avoid screen off";
- }
-
- ScopedPowerLock(const ScopedPowerLock&) = delete;
- ScopedPowerLock& operator=(const ScopedPowerLock&) = delete;
-
- ~ScopedPowerLock() {
- PCHECK(system("set_power_policy --screen_wake_lock=0") != -1)
- << "Invoking set_power_policy to restore wake lock";
- }
-};
-
-class FpsTimer {
- public:
- FpsTimer() { gettimeofday(&start_time_, NULL); }
-
- FpsTimer(const FpsTimer&) = delete;
- FpsTimer& operator=(const FpsTimer&) = delete;
-
- ~FpsTimer() = default;
-
- void Frame() { frames_++; }
-
- void ModifiedFrame() { modified_frames_++; }
-
- // Print FPS stats once a second.
- void MaybePrint() {
- if (Elapsed() < 1.0)
- return;
-
- VLOG(1) << "fps: " << Get(frames_)
- << " (modified frames: " << Get(modified_frames_) << ")";
- modified_frames_ = 0;
- frames_ = 0;
- PCHECK(gettimeofday(&start_time_, NULL) != -1);
- }
-
- private:
- struct timeval start_time_;
- size_t frames_{0};
- size_t modified_frames_{0};
-
- double Elapsed() const {
- struct timeval end_time;
- PCHECK(gettimeofday(&end_time, NULL) != -1);
- double seconds = (end_time.tv_sec - start_time_.tv_sec) +
- (end_time.tv_usec - start_time_.tv_usec) / 1000.0 / 1000.0;
- return seconds;
- }
- double Get(size_t frames) const { return frames / Elapsed(); }
-};
-
-class ScopedSigaction {
- public:
- ScopedSigaction(int signum, void (*handler)(int)) : signum_(signum) {
- struct sigaction new_action;
- new_action.sa_handler = handler;
- sigemptyset(&new_action.sa_mask);
- new_action.sa_flags = 0;
-
- sigaction(signum, &new_action, &old_action_);
- }
-
- ScopedSigaction(const ScopedSigaction&) = delete;
- ScopedSigaction& operator=(const ScopedSigaction&) = delete;
-
- ~ScopedSigaction() { sigaction(signum_, &old_action_, nullptr); }
-
- private:
- const int signum_;
- struct sigaction old_action_;
-};
-
-// Signal number received if shutdown requested.
-volatile int g_shutdown_requested{0};
-
-void SignalHandler(int signum) {
- g_shutdown_requested = signum;
-}
-
-int VncMain() {
- ScopedPowerLock power_lock;
- auto* cmdline = base::CommandLine::ForCurrentProcess();
-
- if (cmdline->GetArgs().size() != 0) {
- LOG(ERROR) << "Wrong number of parameters";
- return 1;
- }
-
- int crtc_specs = (cmdline->HasSwitch(kInternalSwitch) ? 1 : 0) +
- (cmdline->HasSwitch(kExternalSwitch) ? 1 : 0) +
- (cmdline->HasSwitch(kCrtcIdSwitch) ? 1 : 0);
- if (crtc_specs > 1) {
- LOG(ERROR) << "--internal, --external and --crtc-id are exclusive";
- return 1;
- }
-
- std::unique_ptr<Crtc> crtc;
- if (cmdline->HasSwitch(kInternalSwitch)) {
- crtc = screenshot::CrtcFinder::FindInternalDisplay();
- } else if (cmdline->HasSwitch(kExternalSwitch)) {
- crtc = screenshot::CrtcFinder::FindExternalDisplay();
- } else if (cmdline->HasSwitch(kCrtcIdSwitch)) {
- uint32_t crtc_id;
- if (!base::StringToUint(cmdline->GetSwitchValueASCII(kCrtcIdSwitch),
- &crtc_id)) {
- LOG(ERROR) << "Invalid --crtc-id specification";
- return 1;
- }
- crtc = screenshot::CrtcFinder::FindById(crtc_id);
- } else {
- crtc = screenshot::CrtcFinder::FindAnyDisplay();
- }
-
- if (!crtc) {
- LOG(ERROR) << "CRTC not found. Is the screen on?";
- return 1;
- }
-
- uint32_t crtc_width = crtc->width();
- uint32_t crtc_height = crtc->height();
-
- LOG(INFO) << "Starting with CRTC size of: " << crtc_width << " "
- << crtc_height;
-
- if (crtc->planes().empty()) {
- LOG(INFO) << "Capturing primary plane only\n";
- }
-
- constexpr int kBytesPerPixel = 4;
- const rfbScreenInfoPtr server =
- rfbGetScreen(0 /*argc*/, nullptr /*argv*/, crtc_width, crtc_height,
- 8 /*bitsPerSample*/, 3 /*samplesPerPixel*/, kBytesPerPixel);
- CHECK(server);
-
- std::unique_ptr<screenshot::DisplayBuffer> display_buffer;
-
- if (crtc->fb2() || !crtc->planes().empty()) {
- display_buffer.reset(new screenshot::EglDisplayBuffer(
- crtc.get(), 0, 0, crtc_width, crtc_height));
- } else {
- display_buffer.reset(new screenshot::GbmBoDisplayBuffer(
- crtc.get(), 0, 0, crtc_width, crtc_height));
- }
-
- // This is ARGB buffer.
- {
- auto capture_result = display_buffer->Capture();
- server->frameBuffer = static_cast<char*>(capture_result.buffer);
- }
- // http://libvncserver.sourceforge.net/doc/html/rfbproto_8h_source.html#l00150
- server->serverFormat.redMax = 255;
- server->serverFormat.greenMax = 255;
- server->serverFormat.blueMax = 255;
- server->serverFormat.redShift = 16;
- server->serverFormat.greenShift = 8;
- server->serverFormat.blueShift = 0;
-
- // TODO(shaochuan) add input handling.
-
- rfbInitServer(server);
-
- std::vector<char> prev(crtc_width * crtc_height * kBytesPerPixel);
-
- ScopedSigaction sa1(SIGINT, SignalHandler);
- ScopedSigaction sa2(SIGTERM, SignalHandler);
- FpsTimer timer;
-
- while (rfbIsActive(server)) {
- timer.Frame();
- timer.MaybePrint();
-
- auto capture_result = display_buffer->Capture();
-
- // Find rectangle of modification.
- int min_x = crtc_width;
- int min_y = crtc_height;
- int max_x = 0;
- int max_y = 0;
- const char* current = static_cast<char*>(capture_result.buffer);
- for (int y = 0; y < crtc_height; y++) {
- for (int x = 0; x < crtc_width; x++) {
- if (*reinterpret_cast<const uint32_t*>(
- ¤t[(x + y * crtc_width) * kBytesPerPixel]) ==
- *reinterpret_cast<uint32_t*>(
- &prev[(x + y * crtc_width) * kBytesPerPixel])) {
- continue;
- }
- max_x = std::max(x, max_x);
- max_y = std::max(y, max_y);
- min_x = std::min(x, min_x);
- min_y = std::min(y, min_y);
- }
- }
-
- // Keep the previous framebuffer around for comparison.
- std::memcpy(prev.data(), current, prev.size());
-
- if ((min_x > max_x) || (min_y > max_y)) {
- // Skipping unchanged frame.
- } else {
- timer.ModifiedFrame();
- rfbMarkRectAsModified(server, min_x, min_y, max_x, max_y);
- }
-
- // deferUpdateTime (select timeout waiting for sockets) 60fps is 16ms if
- // everything else happened in an instant.
- rfbProcessEvents(server, 16000 /*deferUpdateTime*/);
- if (g_shutdown_requested) {
- LOG(INFO) << "Caught signal, shutting down";
- rfbShutdownServer(server, true /*disconnectClients*/);
- }
- }
-
- return 0;
-}
-
-} // namespace
-} // namespace screenshot
-
-int main(int argc, char** argv) {
- base::CommandLine::Init(argc, argv);
-
- return screenshot::VncMain();
-}
diff --git a/screen-capture-utils/screenshot.cc b/screen-capture-utils/main.cc
similarity index 100%
rename from screen-capture-utils/screenshot.cc
rename to screen-capture-utils/main.cc
