Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "screencap: Allow virtual display ID in -d switch" into udc-dev am: 250376b0d0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23449467

Change-Id: Ib42f13624a74f60aa77e23e45320cb12b39de22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Huihong Luo
2023-05-30 17:08:55 +00:00
committed by Automerger Merge Worker
parent f346da376f 250376b0d0
commit 61c1a0e22d
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmds/screencap/screencap.cpp
View File

@@ -30,6 +30,8 @@
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <ftl/concat.h>
#include <ftl/optional.h>
#include <gui/ISurfaceComposer.h> #include <gui/ISurfaceComposer.h>
#include <gui/SurfaceComposerClient.h> #include <gui/SurfaceComposerClient.h>
#include <gui/SyncScreenCaptureListener.h> #include <gui/SyncScreenCaptureListener.h>
@@ -45,14 +47,7 @@ using namespace android;
#define COLORSPACE_SRGB 1 #define COLORSPACE_SRGB 1
#define COLORSPACE_DISPLAY_P3 2 #define COLORSPACE_DISPLAY_P3 2
static void usage(const char* pname, std::optional<PhysicalDisplayId> displayId) void usage(const char* pname, ftl::Optional<DisplayId> displayIdOpt) {
{
std::string defaultDisplayStr = "";
if (!displayId) {
defaultDisplayStr = "";
} else {
defaultDisplayStr = " (default: " + to_string(*displayId) + ")";
}
fprintf(stderr, fprintf(stderr,
"usage: %s [-hp] [-d display-id] [FILENAME]\n" "usage: %s [-hp] [-d display-id] [FILENAME]\n"
" -h: this message\n" " -h: this message\n"
@@ -61,7 +56,13 @@ static void usage(const char* pname, std::optional<PhysicalDisplayId> displayId)
" see \"dumpsys SurfaceFlinger --display-id\" for valid display IDs.\n" " see \"dumpsys SurfaceFlinger --display-id\" for valid display IDs.\n"
"If FILENAME ends with .png it will be saved as a png.\n" "If FILENAME ends with .png it will be saved as a png.\n"
"If FILENAME is not given, the results will be printed to stdout.\n", "If FILENAME is not given, the results will be printed to stdout.\n",
pname, defaultDisplayStr.c_str()); pname,
displayIdOpt
.transform([](DisplayId id) {
return std::string(ftl::Concat(" (default: ", id.value, ')').str());
})
.value_or(std::string())
.c_str());
} }
static int32_t flinger2bitmapFormat(PixelFormat f) static int32_t flinger2bitmapFormat(PixelFormat f)
@@ -132,7 +133,7 @@ int main(int argc, char** argv)
fprintf(stderr, "Failed to get ID for any displays.\n"); fprintf(stderr, "Failed to get ID for any displays.\n");
return 1; return 1;
} }
std::optional<PhysicalDisplayId> displayId; std::optional<DisplayId> displayIdOpt;
const char* pname = argv[0]; const char* pname = argv[0];
bool png = false; bool png = false;
int c; int c;
@@ -142,8 +143,8 @@ int main(int argc, char** argv)
png = true; png = true;
break; break;
case 'd': case 'd':
displayId = DisplayId::fromValue<PhysicalDisplayId>(atoll(optarg)); displayIdOpt = DisplayId::fromValue(atoll(optarg));
if (!displayId) { if (!displayIdOpt) {
fprintf(stderr, "Invalid display ID: %s\n", optarg); fprintf(stderr, "Invalid display ID: %s\n", optarg);
return 1; return 1;
} }
@@ -151,15 +152,15 @@ int main(int argc, char** argv)
case '?': case '?':
case 'h': case 'h':
if (ids.size() == 1) { if (ids.size() == 1) {
displayId = ids.front(); displayIdOpt = ids.front();
} }
usage(pname, displayId); usage(pname, displayIdOpt);
return 1; return 1;
} }
} }
if (!displayId) { // no diplsay id is specified if (!displayIdOpt) {
displayId = ids.front(); displayIdOpt = ids.front();
if (ids.size() > 1) { if (ids.size() > 1) {
fprintf(stderr, fprintf(stderr,
"[Warning] Multiple displays were found, but no display id was specified! " "[Warning] Multiple displays were found, but no display id was specified! "
@@ -191,7 +192,7 @@ int main(int argc, char** argv)
} }
if (fd == -1) { if (fd == -1) {
usage(pname, displayId); usage(pname, displayIdOpt);
return 1; return 1;
} }
@@ -208,7 +209,7 @@ int main(int argc, char** argv)
ProcessState::self()->startThreadPool(); ProcessState::self()->startThreadPool();
sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener(); sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();
status_t result = ScreenshotClient::captureDisplay(*displayId, captureListener); status_t result = ScreenshotClient::captureDisplay(*displayIdOpt, captureListener);
if (result != NO_ERROR) { if (result != NO_ERROR) {
close(fd); close(fd);
return 1; return 1;