ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"

Browse source 
* commit '6da66ef49b7c35cc5050a4a6b9771801640fb99b':
  Handle screendumps for all framebuffer sizes
This commit is contained in:
Colin Cross 2013-10-02 14:28:34 -07:00 • committed by Android Git Automerger
commit b024bbf6a1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
adb/framebuffer_service.c
View file

@ -55,13 +55,13 @@ struct fbinfo {
void framebuffer_service(int fd, void *cookie) void framebuffer_service(int fd, void *cookie)
{ {
struct fbinfo fbinfo; struct fbinfo fbinfo;
unsigned int i; unsigned int i, bsize;
char buf[640]; char buf[640];
int fd_screencap; int fd_screencap;
int w, h, f; int w, h, f;
int fds[2]; int fds[2];
if (pipe(fds) < 0) goto done; if (pipe(fds) < 0) goto pipefail;
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) goto done; if (pid < 0) goto done;
@ -164,17 +164,19 @@ void framebuffer_service(int fd, void *cookie)
if(writex(fd, &fbinfo, sizeof(fbinfo))) goto done; if(writex(fd, &fbinfo, sizeof(fbinfo))) goto done;
/* write data */ /* write data */
for(i = 0; i < fbinfo.size; i += sizeof(buf)) { for(i = 0; i < fbinfo.size; i += bsize) {
if(readx(fd_screencap, buf, sizeof(buf))) goto done; bsize = sizeof(buf);
if(writex(fd, buf, sizeof(buf))) goto done; if (i + bsize > fbinfo.size)
bsize = fbinfo.size - i;
if(readx(fd_screencap, buf, bsize)) goto done;
if(writex(fd, buf, bsize)) goto done;
} }
if(readx(fd_screencap, buf, fbinfo.size % sizeof(buf))) goto done;
if(writex(fd, buf, fbinfo.size % sizeof(buf))) goto done;
done: done:
TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
close(fds[0]); close(fds[0]);
close(fds[1]); close(fds[1]);
pipefail:
close(fd); close(fd);
} }