From 77e3c46ba9e763ac240f56d9365208c422fc6b20 Mon Sep 17 00:00:00 2001 From: "hans@rhel5-devel.localdomain" Date: Mon, 8 Jun 2009 11:16:43 +0200 Subject: libv4l: move ov518 decompression code to an external helper From: Hans de Goede Change support for decompressing ov518 "JPEG" to piping data through an external helper as I've failed to contact Mark W. McClelland to get permission to relicense the code. If you know a working email address for Mark W. McClelland, please let me know. Priority: normal Signed-off-by: Hans de Goede --- v4l2-apps/libv4l/libv4lconvert/helper-funcs.h | 76 +++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 v4l2-apps/libv4l/libv4lconvert/helper-funcs.h (limited to 'v4l2-apps/libv4l/libv4lconvert/helper-funcs.h') diff --git a/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h b/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h new file mode 100644 index 000000000..e27f21e42 --- /dev/null +++ b/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h @@ -0,0 +1,76 @@ +/* Utility functions for decompression helpers + * + * Copyright (c) 2009 Hans de Goede + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +static int v4lconvert_helper_write(int fd, const void *b, size_t count, + char *progname) +{ + const unsigned char *buf = b; + size_t ret, written = 0; + + while (written < count) { + ret = write(fd, buf + written, count - written); + if (ret == -1) { + if (errno == EINTR) + continue; + + fprintf(stderr, "%s: error writing: %s\n", progname, strerror(errno)); + return -1; + } + written += ret; + } + + return 0; +} + +static int v4lconvert_helper_read(int fd, void *b, size_t count, + char *progname) +{ + unsigned char *buf = b; + size_t ret, r = 0; + + while (r < count) { + ret = read(fd, buf + r, count - r); + if (ret == -1) { + if (errno == EINTR) + continue; + + fprintf(stderr, "%s: error reading: %s\n", progname, strerror(errno)); + return -1; + } + if (ret == 0) /* EOF */ + exit(0); + + r += ret; + } + + return 0; +} -- cgit v1.2.3 From fc84b59143ed42e39bed4f6005100c4b8bb18bde Mon Sep 17 00:00:00 2001 From: "hans@rhel5-devel.localdomain" Date: Fri, 12 Jun 2009 10:41:04 +0200 Subject: libv4l: add support for decompressing ov511 compressed frames From: Hans de Goede libv4l: add support for decompressing ov511 compressed frames Priority: normal Signed-off-by: Hans de Goede --- v4l2-apps/libv4l/libv4lconvert/helper-funcs.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'v4l2-apps/libv4l/libv4lconvert/helper-funcs.h') diff --git a/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h b/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h index e27f21e42..8ce12343c 100644 --- a/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h +++ b/v4l2-apps/libv4l/libv4lconvert/helper-funcs.h @@ -42,6 +42,9 @@ static int v4lconvert_helper_write(int fd, const void *b, size_t count, if (errno == EINTR) continue; + if (errno == EPIPE) /* Main program has quited */ + exit(0); + fprintf(stderr, "%s: error writing: %s\n", progname, strerror(errno)); return -1; } -- cgit v1.2.3