am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99': fix [3374821] Cannot take screenshot of HC preview
This commit is contained in:
@@ -19,6 +19,10 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#include <linux/fb.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
|
||||||
#include <binder/IMemory.h>
|
#include <binder/IMemory.h>
|
||||||
#include <surfaceflinger/SurfaceComposerClient.h>
|
#include <surfaceflinger/SurfaceComposerClient.h>
|
||||||
|
|
||||||
@@ -28,14 +32,15 @@
|
|||||||
|
|
||||||
using namespace android;
|
using namespace android;
|
||||||
|
|
||||||
static void usage()
|
static void usage(const char* pname)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"usage: screenshot [-hp] [FILENAME]\n"
|
"usage: %s [-hp] [FILENAME]\n"
|
||||||
" -h: this message\n"
|
" -h: this message\n"
|
||||||
" -p: save the file as a png.\n"
|
" -p: save the file as a png.\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
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,8 +59,33 @@ static SkBitmap::Config flinger2skia(PixelFormat f)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static status_t vinfoToPixelFormat(const fb_var_screeninfo& vinfo,
|
||||||
|
uint32_t* bytespp, uint32_t* f)
|
||||||
|
{
|
||||||
|
|
||||||
|
switch (vinfo.bits_per_pixel) {
|
||||||
|
case 16:
|
||||||
|
*f = PIXEL_FORMAT_RGB_565;
|
||||||
|
*bytespp = 2;
|
||||||
|
break;
|
||||||
|
case 24:
|
||||||
|
*f = PIXEL_FORMAT_RGB_888;
|
||||||
|
*bytespp = 3;
|
||||||
|
break;
|
||||||
|
case 32:
|
||||||
|
// TODO: do better decoding of vinfo here
|
||||||
|
*f = PIXEL_FORMAT_RGBX_8888;
|
||||||
|
*bytespp = 4;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return BAD_VALUE;
|
||||||
|
}
|
||||||
|
return NO_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
const char* pname = argv[0];
|
||||||
bool png = false;
|
bool png = false;
|
||||||
int c;
|
int c;
|
||||||
while ((c = getopt(argc, argv, "ph")) != -1) {
|
while ((c = getopt(argc, argv, "ph")) != -1) {
|
||||||
@@ -65,7 +95,7 @@ int main(int argc, char** argv)
|
|||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
case 'h':
|
case 'h':
|
||||||
usage();
|
usage(pname);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -79,7 +109,7 @@ int main(int argc, char** argv)
|
|||||||
const char* fn = argv[0];
|
const char* fn = argv[0];
|
||||||
fd = open(fn, O_WRONLY | O_CREAT | O_TRUNC, 0664);
|
fd = open(fn, O_WRONLY | O_CREAT | O_TRUNC, 0664);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
fprintf(stderr, "Error opening file: (%d) %s\n", errno, strerror(errno));
|
fprintf(stderr, "Error opening file: %s (%s)\n", fn, strerror(errno));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
const int len = strlen(fn);
|
const int len = strlen(fn);
|
||||||
@@ -89,34 +119,66 @@ int main(int argc, char** argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
usage();
|
usage(pname);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void const* mapbase = MAP_FAILED;
|
||||||
|
ssize_t mapsize = -1;
|
||||||
|
|
||||||
|
void const* base = 0;
|
||||||
|
uint32_t w, h, f;
|
||||||
|
size_t size = 0;
|
||||||
|
|
||||||
ScreenshotClient screenshot;
|
ScreenshotClient screenshot;
|
||||||
if (screenshot.update() != NO_ERROR) {
|
if (screenshot.update() == NO_ERROR) {
|
||||||
return 0;
|
base = screenshot.getPixels();
|
||||||
|
w = screenshot.getWidth();
|
||||||
|
h = screenshot.getHeight();
|
||||||
|
f = screenshot.getFormat();
|
||||||
|
size = screenshot.getSize();
|
||||||
|
} else {
|
||||||
|
const char* fbpath = "/dev/graphics/fb0";
|
||||||
|
int fb = open(fbpath, O_RDONLY);
|
||||||
|
if (fb >= 0) {
|
||||||
|
struct fb_var_screeninfo vinfo;
|
||||||
|
if (ioctl(fb, FBIOGET_VSCREENINFO, &vinfo) == 0) {
|
||||||
|
uint32_t bytespp;
|
||||||
|
if (vinfoToPixelFormat(vinfo, &bytespp, &f) == NO_ERROR) {
|
||||||
|
size_t offset = (vinfo.xoffset + vinfo.yoffset*vinfo.xres) * bytespp;
|
||||||
|
w = vinfo.xres;
|
||||||
|
h = vinfo.yres;
|
||||||
|
size = w*h*bytespp;
|
||||||
|
mapsize = offset + size;
|
||||||
|
mapbase = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, fb, 0);
|
||||||
|
if (mapbase != MAP_FAILED) {
|
||||||
|
base = (void const *)((char const *)mapbase + offset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
close(fb);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void const* base = screenshot.getPixels();
|
if (base) {
|
||||||
uint32_t w = screenshot.getWidth();
|
if (png) {
|
||||||
uint32_t h = screenshot.getHeight();
|
SkBitmap b;
|
||||||
uint32_t f = screenshot.getFormat();
|
b.setConfig(flinger2skia(f), w, h);
|
||||||
|
b.setPixels((void*)base);
|
||||||
if (png) {
|
SkDynamicMemoryWStream stream;
|
||||||
SkBitmap b;
|
SkImageEncoder::EncodeStream(&stream, b,
|
||||||
b.setConfig(flinger2skia(f), w, h);
|
SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality);
|
||||||
b.setPixels((void*)base);
|
write(fd, stream.getStream(), stream.getOffset());
|
||||||
SkDynamicMemoryWStream stream;
|
} else {
|
||||||
SkImageEncoder::EncodeStream(&stream, b,
|
write(fd, &w, 4);
|
||||||
SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality);
|
write(fd, &h, 4);
|
||||||
write(fd, stream.getStream(), stream.getOffset());
|
write(fd, &f, 4);
|
||||||
} else {
|
write(fd, base, size);
|
||||||
write(fd, &w, 4);
|
}
|
||||||
write(fd, &h, 4);
|
|
||||||
write(fd, &f, 4);
|
|
||||||
write(fd, base, w*h*4);
|
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
|
if (mapbase != MAP_FAILED) {
|
||||||
|
munmap((void *)mapbase, mapsize);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user