From d08f0bf0255fac18cd11992679dcb48c085de298 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 11 Jan 2017 22:31:28 +0100 Subject: Fix vu-cut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/stream.c | 1 + src/stream.h | 1 + src/vu-cut.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/stream.c b/src/stream.c index 5d67938..cf6f230 100644 --- a/src/stream.c +++ b/src/stream.c @@ -80,6 +80,7 @@ eninit_stream(int status, struct stream *stream) stream->buf[3] != 'v' || stream->buf[4] != 'f') goto bad_format; memmove(stream->buf, stream->buf + 5, stream->ptr -= 5); + stream->headlen = n + 5; enset_pixel_size(status, stream); diff --git a/src/stream.h b/src/stream.h index c4d6184..bf16f3b 100644 --- a/src/stream.h +++ b/src/stream.h @@ -24,6 +24,7 @@ struct stream size_t ptr; char buf[4096]; const char *file; + size_t headlen; }; void eninit_stream(int status, struct stream *stream); diff --git a/src/vu-cut.c b/src/vu-cut.c index a90f032..e229cf1 100644 --- a/src/vu-cut.c +++ b/src/vu-cut.c @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { struct stream stream; - size_t frame_size, start = 0, end = 0, ptr, max, n; + size_t frame_size, start = 0, end = 0, ptr, max; ssize_t r; char buf[BUFSIZ]; int to_end = 0; @@ -50,19 +50,19 @@ main(int argc, char *argv[]) eprintf("%s\n", start > end ? "start point is after end point" : "refusing to create video with zero frames"); - end *= frame_size; - start *= frame_size; + end = end * frame_size + stream.headlen; + start = start * frame_size + stream.headlen; - for (ptr = start; ptr < end;) { + posix_fadvise(stream.fd, start, end - start, POSIX_FADV_SEQUENTIAL); + for (ptr = start; ptr < end; ptr += (size_t)r) { max = end - ptr; - max = sizeof(buf) < max ? sizeof(buf) : max; - r = read(stream.fd, buf + ptr, max); + max = max < sizeof(buf) ? max : sizeof(buf); + r = pread(stream.fd, buf, max, ptr); if (r < 0) - eprintf("read %s:", stream.file); + eprintf("pread %s:", stream.file); if (r == 0) eprintf("%s: file is shorter than expected\n", stream.file); - ptr += n = (size_t)r; - ewriteall(STDOUT_FILENO, buf, n, ""); + ewriteall(STDOUT_FILENO, buf, (size_t)r, ""); } close(stream.fd); -- cgit v1.2.3-70-g09d2