d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begin basic improvements to fwcontrol in the area of handling

Browse Source 
video streams from cameras.

This patch changes the displayed timer to a time stamp and corrects
one or two mishandled errors.

Submitted by:	imp
This commit is contained in:
Sean Bruno 2009-02-02 21:05:12 +00:00
parent 001944c3bd
commit e627b033dc
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/fwcontrol/fwdv.c
View File

@ -202,15 +202,20 @@ again:
(dv->payload[0] & DV_DSF_12) == 0)
dv->payload[0] |= DV_DSF_12;
nb = nblocks[system];
fprintf(stderr, "%d", k%10);
fprintf(stderr, "%d:%02d:%02d %d\r",
k / (3600 * frame_rate[system]),
(k / (60 * frame_rate[system])) % 60,
(k / frame_rate[system]) % 60,
k % frame_rate[system]);
#if FIX_FRAME
if (m > 0 && m != nb) {
/* padding bad frame */
npad = ((nb - m) % nb);
if (npad < 0)
npad += nb;
fprintf(stderr, "(%d blocks padded)",
npad);
fprintf(stderr, "\n%d blocks padded\n",
npad);
npad *= DSIZE;
wbuf[vec].iov_base = pad;
wbuf[vec++].iov_len = npad;
@ -221,10 +226,6 @@ again:
}
#endif
k++;
if (k % frame_rate[system] == 0) {
/* every second */
fprintf(stderr, "\n");
}
fflush(stderr);
m = 0;
}
@ -245,9 +246,8 @@ next:
if (vec > 0)
writev(fd, wbuf, vec);
}
if(fd != STDOUT_FILENO) {
if (fd != STDOUT_FILENO)
close(fd);
}
fprintf(stderr, "\n");
}

7
usr.sbin/fwcontrol/fwmpegts.c
View File

@ -195,10 +195,9 @@ mpegtsrecv(int d, const char *filename, char ich, int count)
if (len < 0) {
if (errno == EAGAIN) {
fprintf(stderr, "(EAGAIN) - push 'Play'?\n");
if (len <= 0)
continue;
} else
err(1, "read failed");
continue;
}
err(1, "read failed");
}
ptr = (uint32_t *) buf;