V4L2-library July 2008

v4l2-library@linuxtv.org

7 participants
23 discussions

PATCH: libv4l-fix-idct-inline-assembly.diff
by Gregor Jasny 04 Jul '08

04 Jul '08

Hi, This patch fixes the input constraint for the sar instruction. It allows only an immediate or cl as shift width. Thanks, Gregor Signed-off-by: Gregor Jasny <jasny(a)vidsoft.de> diff -r 61deeffda900 v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c --- a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c Fri Jul 04 07:21:55 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c Fri Jul 04 16:24:33 2008 +0200 @@ -92,7 +92,7 @@ static inline unsigned char descale_and_ "\tcmpl %4,%1\n" "\tcmovg %4,%1\n" : "=r"(x) - : "0"(x), "Ir"(shift), "ir"(1UL<<(shift-1)), "r" (0xff), "r" (0) + : "0"(x), "Ic"((unsigned char)shift), "ir"(1UL<<(shift-1)), "r" (0xff), "r" (0) ); return x; }

3 2

Announcing libv4l 0.3.2
by Hans de Goede 04 Jul '08

04 Jul '08

Hi All, I'm happy to announce version 0.3.2 of libv4l: http://people.atrpms.net/~hdegoede/libv4l-0.3.2.tar.gz This release has the following changes (baby steps now): libv4l-0.3.2 ------------ * Add support for converting from sn9c10x compressed data * Add support for converting from pac207 compressed data * Add "make install" Makefile target Regards, Hans

1 0

PATCH: libv4l-warnings.patch
by Hans de Goede 04 Jul '08

04 Jul '08

Hi, Fix all compiler warnings in libv4l Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans Fix all compiler warnings in libv4l Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h --- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h Fri Jul 04 15:50:05 2008 +0200 @@ -64,7 +64,7 @@ unsigned int v4l1_pal; /* VIDEO_PALETTE */ unsigned int v4l2_pixfmt; /* V4L2_PIX_FMT */ unsigned int min_width, min_height, max_width, max_height; - int width, height; + unsigned int width, height; unsigned char *v4l1_frame_pointer; }; diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l1/libv4l1.c --- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c Fri Jul 04 15:50:05 2008 +0200 @@ -70,9 +70,10 @@ #define V4L1_PIX_SIZE_TOUCHED 0x08 static pthread_mutex_t v4l1_open_mutex = PTHREAD_MUTEX_INITIALIZER; -static struct v4l1_dev_info devices[V4L1_MAX_DEVICES] = { {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1} }; +static struct v4l1_dev_info devices[V4L1_MAX_DEVICES] = { { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }}; static int devices_used = 0; static unsigned int palette_to_pixelformat(unsigned int palette) @@ -135,8 +136,8 @@ return 0; } -static int v4l1_set_format(int index, int width, int height, - int v4l1_pal, int width_height_may_differ) +static int v4l1_set_format(int index, unsigned int width, + unsigned int height, int v4l1_pal, int width_height_may_differ) { int result; unsigned int v4l2_pixfmt; @@ -748,7 +749,7 @@ void *v4l1_mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset) + __off_t offset) { int index; void *result; diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c --- a/v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c Fri Jul 04 15:50:05 2008 +0200 @@ -77,7 +77,7 @@ } void mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset) + __off_t offset) { return v4l1_mmap(start, length, prot, flags, fd, offset); } diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h --- a/v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h Fri Jul 04 15:50:05 2008 +0200 @@ -27,7 +27,7 @@ /* Warning when making this larger the frame_queued and frame_mapped members of the v4l2_dev_info struct can no longer be a bitfield, so the code needs to be adjusted! */ -#define V4L2_MAX_NO_FRAMES 32u +#define V4L2_MAX_NO_FRAMES 32 #define V4L2_DEFAULT_NREADBUFFERS 4 #define V4L2_FRAME_BUF_SIZE (4096 * 4096) diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l2/libv4l2.c --- a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c Fri Jul 04 15:50:05 2008 +0200 @@ -80,9 +80,10 @@ #define V4L2_MMAP_OFFSET_MAGIC 0xABCDEF00u static pthread_mutex_t v4l2_open_mutex = PTHREAD_MUTEX_INITIALIZER; -static struct v4l2_dev_info devices[V4L2_MAX_DEVICES] = { {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}}; +static struct v4l2_dev_info devices[V4L2_MAX_DEVICES] = { { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, + { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }, { .fd = -1 }}; static int devices_used = 0; @@ -830,7 +831,7 @@ ssize_t v4l2_read (int fd, void* buffer, size_t n) { ssize_t result; - int index, bytesused, frame_index; + int index, bytesused = 0, frame_index; if ((index = v4l2_get_index(fd)) == -1) return syscall(SYS_read, fd, buffer, n); @@ -867,7 +868,7 @@ } void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset) + __off_t offset) { int index; unsigned int buffer_index; @@ -877,7 +878,7 @@ /* Check if the mmap data matches our answer to QUERY_BUF, if it doesn't let the kernel handle it (to allow for mmap based non capture use) */ start || length != V4L2_FRAME_BUF_SIZE || - (offset & ~0xff) != V4L2_MMAP_OFFSET_MAGIC) { + ((unsigned int)offset & ~0xFFu) != V4L2_MMAP_OFFSET_MAGIC) { if (index != -1) V4L2_LOG("Passing mmap(%p, %d, ..., %x, through to the driver\n", start, (int)length, (int)offset); diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c --- a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c Fri Jul 04 15:50:05 2008 +0200 @@ -110,7 +110,7 @@ } void mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset) + __off_t offset) { return v4l2_mmap(start, length, prot, flags, fd, offset); } diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h --- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h Fri Jul 04 15:50:05 2008 +0200 @@ -57,7 +57,7 @@ struct v4lconvert_data { int fd; int supported_src_formats; /* bitfield */ - int no_formats; + unsigned int no_formats; char error_msg[V4LCONVERT_ERROR_MSG_SIZE]; struct jdec_private *jdec; }; diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c --- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Fri Jul 04 15:50:05 2008 +0200 @@ -25,6 +25,7 @@ #include "libv4lconvert-priv.h" #define MIN(a,b) (((a)<(b))?(a):(b)) +#define ARRAY_SIZE(x) ((int)sizeof(x)/(int)sizeof((x)[0])) static const unsigned int supported_src_pixfmts[] = { V4L2_PIX_FMT_BGR24, @@ -39,13 +40,11 @@ V4L2_PIX_FMT_SPCA561, V4L2_PIX_FMT_SN9C10X, V4L2_PIX_FMT_PAC207, - -1 }; static const unsigned int supported_dst_pixfmts[] = { V4L2_PIX_FMT_BGR24, V4L2_PIX_FMT_YUV420, - -1 }; @@ -69,7 +68,7 @@ if (syscall(SYS_ioctl, fd, VIDIOC_ENUM_FMT, &fmt)) break; - for (j = 0; supported_src_pixfmts[j] != -1; j++) + for (j = 0; j < ARRAY_SIZE(supported_src_pixfmts); j++) if (fmt.pixelformat == supported_src_pixfmts[j]) { data->supported_src_formats |= 1 << j; break; @@ -100,7 +99,7 @@ return syscall(SYS_ioctl, data->fd, VIDIOC_ENUM_FMT, fmt); fmt->flags = 0; - fmt->pixelformat = -1; + fmt->pixelformat = 0; memset(fmt->reserved, 0, 4); /* Note bgr24 and yuv420 are the first 2 in our mask of supported formats */ @@ -121,7 +120,7 @@ } break; } - if (fmt->pixelformat == -1) { + if (fmt->pixelformat == 0) { errno = EINVAL; return -1; } @@ -134,16 +133,16 @@ struct v4l2_format *dest_fmt, struct v4l2_format *src_fmt) { int i; - unsigned int try_pixfmt, closest_fmt_size_diff = -1; + unsigned int closest_fmt_size_diff = -1; unsigned int desired_pixfmt = dest_fmt->fmt.pix.pixelformat; - struct v4l2_format try_fmt, closest_fmt = { .type = -1 }; + struct v4l2_format try_fmt, closest_fmt = { .type = 0 }; - for (i = 0; supported_dst_pixfmts[i] != -1; i++) + for (i = 0; i < ARRAY_SIZE(supported_dst_pixfmts); i++) if (supported_dst_pixfmts[i] == desired_pixfmt) break; /* Can we do conversion to the requested format & type? */ - if (supported_dst_pixfmts[i] == -1 || + if (i == ARRAY_SIZE(supported_dst_pixfmts) || dest_fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { int ret = syscall(SYS_ioctl, data->fd, VIDIOC_TRY_FMT, dest_fmt); if (src_fmt) @@ -151,17 +150,17 @@ return ret; } - for (i = 0; (try_pixfmt = supported_src_pixfmts[i]) != -1; i++) { + for (i = 0; i < ARRAY_SIZE(supported_src_pixfmts); i++) { /* is this format supported? */ if (!(data->supported_src_formats & (1 << i))) continue; try_fmt = *dest_fmt; - try_fmt.fmt.pix.pixelformat = try_pixfmt; + try_fmt.fmt.pix.pixelformat = supported_src_pixfmts[i]; if (!syscall(SYS_ioctl, data->fd, VIDIOC_TRY_FMT, &try_fmt)) { - if (try_fmt.fmt.pix.pixelformat == try_pixfmt) { + if (try_fmt.fmt.pix.pixelformat == supported_src_pixfmts[i]) { int size_x_diff = abs((int)try_fmt.fmt.pix.width - (int)dest_fmt->fmt.pix.width); int size_y_diff = abs((int)try_fmt.fmt.pix.height - @@ -176,7 +175,7 @@ } } - if (closest_fmt.type == -1) { + if (closest_fmt.type == 0) { errno = EINVAL; return -1; } @@ -322,7 +321,7 @@ case V4L2_PIX_FMT_PAC207: { unsigned char tmpbuf[dest_fmt->fmt.pix.width*dest_fmt->fmt.pix.height]; - unsigned int bayer_fmt; + unsigned int bayer_fmt = 0; switch (src_fmt->fmt.pix.pixelformat) { case V4L2_PIX_FMT_SPCA561: diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c --- a/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c Fri Jul 04 15:50:05 2008 +0200 @@ -139,7 +139,7 @@ int val; int bitpos; unsigned char code; - unsigned char *addr; + const unsigned char *addr; if (!init_done) sonix_decompress_init(); diff -r ac2bd9892cf0 v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c --- a/v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c Fri Jul 04 14:13:03 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c Fri Jul 04 15:50:05 2008 +0200 @@ -307,7 +307,7 @@ static int accum[8 * 8 * 8]; static int i_hits[8 * 8 * 8]; - const static int nbits_A[] = + const int nbits_A[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -335,7 +335,7 @@ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, }; - const static int tab_A[] = + const int tab_A[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -370,7 +370,7 @@ 1 }; - const static int nbits_B[] = + const int nbits_B[] = { 0, 8, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -398,7 +398,7 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; - const static int tab_B[] = + const int tab_B[] = { 0xff, -4, 3, 3, -3, -3, -3, -3, 2, 2, 2, 2, 2, 2, 2, 2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, 1, 1, @@ -433,7 +433,7 @@ 0, 0, 0, 0, 0, 0, 0, }; - const static int nbits_C[] = + const int nbits_C[] = { 0, 0, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -461,7 +461,7 @@ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, }; - const static int tab_C[] = + const int tab_C[] = { 0xff, 0xfe, 6, -7, 5, 5, -6, -6, 4, 4, 4, 4, -5, -5, -5, -5, 3, 3, 3, 3, 3, 3, 3, 3, -4, -4, -4, -4, -4, -4, -4, -4, 2, 2, 2, 2, @@ -497,7 +497,7 @@ -1, }; - const static int nbits_D[] = + const int nbits_D[] = { 0, 0, 0, 0, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -525,7 +525,7 @@ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; - const static int tab_D[] = + const int tab_D[] = { 0xff, 0xfe, 0xfd, 0xfc, 10, -11, 11, -12, 8, 8, -9, -9, 9, 9, -10, -10, 6, 6, 6, 6, -7, -7, -7, -7, 7, 7, 7, 7, -8, -8, -8, -8, @@ -563,7 +563,7 @@ }; /* a_curve[19 + i] = ... [-19..19] => [-160..160] */ - const static int a_curve[] = + const int a_curve[] = { -160, -144, -128, -112, -98, -88, -80, -72, -64, -56, -48, -40, -32, -24, -18, -12, -8, -5, -2, 0, 2, 5, 8, 12, 18, 24, 32, @@ -571,7 +571,7 @@ 72, 80, 88, 98, 112, 128, 144, 160 }; /* clamp0_255[256 + i] = min(max(i,255),0) */ - const static unsigned char clamp0_255[] = + const unsigned char clamp0_255[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -680,14 +680,14 @@ 255 }; /* abs_clamp15[19 + i] = min(abs(i), 15) */ - const static int abs_clamp15[] = + const int abs_clamp15[] = { 15, 15, 15, 15, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15 }; /* diff_encoding[256 + i] = ... */ - const static int diff_encoding[] = + const int diff_encoding[] = { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,

1 0

PATCH: libv4l-makefile-improvements.patch
by Hans de Goede 04 Jul '08

04 Jul '08

Hi, Makefile improvements: * Split DESTDIR into DESTDIR and PREFIX as used in most makefiles out there * Add LIBDIR variable to allow installation in <prefix>/lib64 for example * Install the wrappers in <libdir>/libv4l instead of directly under libdir, as they are not libraries meant for linking * preserve timestamps of header files when installing them Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans Makefile improvements: * Split DESTDIR into DESTDIR and PREFIX as used in most makefiles out there * Add LIBDIR variable to allow installation in <prefix>/lib64 for example * Install the wrappers in <libdir>/libv4l instead of directly under libdir, as they are not libraries meant for linking * preserve timestamps of header files when installing them Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> diff -r d4e241f9a06c v4l2-apps/lib/libv4l/README --- a/v4l2-apps/lib/libv4l/README Fri Jul 04 13:21:38 2008 +0200 +++ b/v4l2-apps/lib/libv4l/README Fri Jul 04 13:52:07 2008 +0200 @@ -59,11 +59,12 @@ counterparts. The preloadable libv4l1 wrapper which adds v4l2 device compatibility to v4l1 -applications is called v4l1compat.so. The preloadable libv4l1 wrapper which -adds v4l2 device compatibility to v4l1 applications is called v4l2convert.so +applications is called v4l1compat.so. The preloadable libv4l2 wrapper which +adds support for various pixelformats to v4l2 applications is called +v4l2convert.so. Example usage (after install in default location): -$ export LD_PRELOAD=/usr/local/lib/v4l1compat.so +$ export LD_PRELOAD=/usr/local/lib/libv4l/v4l1compat.so $ camorama @@ -71,9 +72,12 @@ ------------------------- Simple type the following commands from the libv4l-x.y.z directory -(adjusting DESTDIR as desired): +(adjusting PREFIX as desired): make -make install DESTDIR=/usr/local +make install PREFIX=/usr/local + +Note: make install also supports the DESTDIR=... paramter for installation +into chroots. FAQ diff -r d4e241f9a06c v4l2-apps/lib/libv4l/libv4l1/Makefile --- a/v4l2-apps/lib/libv4l/libv4l1/Makefile Fri Jul 04 13:21:38 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l1/Makefile Fri Jul 04 13:52:07 2008 +0200 @@ -19,8 +19,12 @@ LIB_RELEASE = 0 endif -ifeq ($(DESTDIR),) -DESTDIR = /usr/local +ifeq ($(PREFIX),) +PREFIX = /usr/local +endif + +ifeq ($(LIBDIR),) +LIBDIR = $(PREFIX)/lib endif all: $(TARGETS) @@ -31,15 +35,14 @@ $(V4L1COMPAT): $(V4L1COMPAT_O) $(V4L1_LIB) install: all - mkdir -p $(DESTDIR)/include - cp $(INCLUDES) $(DESTDIR)/include - mkdir -p $(DESTDIR)/lib - cp $(V4L1_LIB).$(LIB_RELEASE) $(DESTDIR)/lib - cd $(DESTDIR)/lib && \ + mkdir -p $(DESTDIR)$(PREFIX)/include + install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include + mkdir -p $(DESTDIR)$(LIBDIR)/libv4l + install -m 755 $(V4L1_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR) && \ ln -f -s $(V4L1_LIB).$(LIB_RELEASE) $(V4L1_LIB) - cp $(V4L1COMPAT).$(LIB_RELEASE) $(DESTDIR)/lib - cd $(DESTDIR)/lib && \ - ln -f -s $(V4L1COMPAT).$(LIB_RELEASE) $(V4L1COMPAT) + install -m 755 $(V4L1COMPAT).$(LIB_RELEASE) \ + $(DESTDIR)$(LIBDIR)/libv4l/$(V4L1COMPAT) clean:: rm -f *.so* *.o log *~ diff -r d4e241f9a06c v4l2-apps/lib/libv4l/libv4l2/Makefile --- a/v4l2-apps/lib/libv4l/libv4l2/Makefile Fri Jul 04 13:21:38 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4l2/Makefile Fri Jul 04 13:52:07 2008 +0200 @@ -19,8 +19,12 @@ LIB_RELEASE = 0 endif -ifeq ($(DESTDIR),) -DESTDIR = /usr/local +ifeq ($(PREFIX),) +PREFIX = /usr/local +endif + +ifeq ($(LIBDIR),) +LIBDIR = $(PREFIX)/lib endif all: $(TARGETS) @@ -30,15 +34,14 @@ $(V4L2CONVERT): $(V4L2CONVERT_O) $(V4L2_LIB) install: all - mkdir -p $(DESTDIR)/include - cp $(INCLUDES) $(DESTDIR)/include - mkdir -p $(DESTDIR)/lib - cp $(V4L2_LIB).$(LIB_RELEASE) $(DESTDIR)/lib - cd $(DESTDIR)/lib && \ + mkdir -p $(DESTDIR)$(PREFIX)/include + install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include + mkdir -p $(DESTDIR)$(LIBDIR)/libv4l + install -m 755 $(V4L2_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR) && \ ln -f -s $(V4L2_LIB).$(LIB_RELEASE) $(V4L2_LIB) - cp $(V4L2CONVERT).$(LIB_RELEASE) $(DESTDIR)/lib - cd $(DESTDIR)/lib && \ - ln -f -s $(V4L2CONVERT).$(LIB_RELEASE) $(V4L2CONVERT) + install -m 755 $(V4L2CONVERT).$(LIB_RELEASE) \ + $(DESTDIR)$(LIBDIR)/libv4l/$(V4L2CONVERT) clean:: rm -f *.so* *.o log *~ diff -r d4e241f9a06c v4l2-apps/lib/libv4l/libv4lconvert/Makefile --- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Fri Jul 04 13:21:38 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Fri Jul 04 13:52:07 2008 +0200 @@ -18,8 +18,12 @@ LIB_RELEASE = 0 endif -ifeq ($(DESTDIR),) -DESTDIR = /usr/local +ifeq ($(PREFIX),) +PREFIX = /usr/local +endif + +ifeq ($(LIBDIR),) +LIBDIR = $(PREFIX)/lib endif all: $(TARGETS) @@ -27,11 +31,11 @@ $(CONVERT_LIB): $(CONVERT_OBJS) install: all - mkdir -p $(DESTDIR)/include - cp $(INCLUDES) $(DESTDIR)/include - mkdir -p $(DESTDIR)/lib - cp $(CONVERT_LIB).$(LIB_RELEASE) $(DESTDIR)/lib - cd $(DESTDIR)/lib && \ + mkdir -p $(DESTDIR)$(PREFIX)/include + install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include + mkdir -p $(DESTDIR)$(LIBDIR) + install -m 755 $(CONVERT_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR) && \ ln -f -s $(CONVERT_LIB).$(LIB_RELEASE) $(CONVERT_LIB) clean::

1 0

PATCH: libv4l-update-documentation.patch
by Hans de Goede 04 Jul '08

04 Jul '08

Hi, Some documentation updates to bring the documentation up2date with the latest changes. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans Some documentation updates to bring the documentation up2date with the latest changes. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> diff -r 5a184775625e v4l2-apps/lib/libv4l/INSTALL --- a/v4l2-apps/lib/libv4l/INSTALL Fri Jul 04 13:09:05 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -To compile simply type "make" after that you can find the compiled libraries -and wrappers under the lib dir, public headers are under the include dir. - -Sorry no make install target for now. diff -r 5a184775625e v4l2-apps/lib/libv4l/README --- a/v4l2-apps/lib/libv4l/README Fri Jul 04 13:09:05 2008 +0200 +++ b/v4l2-apps/lib/libv4l/README Fri Jul 04 13:18:59 2008 +0200 @@ -62,10 +62,18 @@ applications is called v4l1compat.so. The preloadable libv4l1 wrapper which adds v4l2 device compatibility to v4l1 applications is called v4l2convert.so -Example usage: -$ export LD_LIBRARY_PATH=`pwd`/lib -$ export LD_PRELOAD=`pwd`/lib/v4l1compat.so +Example usage (after install in default location): +$ export LD_PRELOAD=/usr/local/lib/v4l1compat.so $ camorama + + +Installation Instructions +------------------------- + +Simple type the following commands from the libv4l-x.y.z directory +(adjusting DESTDIR as desired): +make +make install DESTDIR=/usr/local FAQ diff -r 5a184775625e v4l2-apps/lib/libv4l/TODO --- a/v4l2-apps/lib/libv4l/TODO Fri Jul 04 13:09:05 2008 +0200 +++ b/v4l2-apps/lib/libv4l/TODO Fri Jul 04 13:18:59 2008 +0200 @@ -1,11 +1,3 @@ --protect open() against being called from different threads simultaniously, - we are then thread safe except for the jpeg decompression under the following - assumption: - * We assume all device setup (for a single device) is done from a single - thread - * We assume that at the time an videodev fd gets closed all other threads - which may have been using it have stopped using it. - -add support for setting / getting the number of read buffers -add code to v4l2_read to not return frames more then say 5 seconds old @@ -15,12 +7,6 @@ impossible for overlays) can be done, so that it will no longer be necessary to implement CGMBUF in the kernel for each driver. --add (configurable) support for alsa faking enum_fmt to libv4l2 ? - -check v4l2_field during conversion --add make install target - -add conversion from bgr24 to yuv420 - --add v4l2_dup, make re-entrant safe (for gstreamer v4l2 support)

1 0

PATCH: libv4l-pac207-comments.patch
by Hans de Goede 04 Jul '08

04 Jul '08

<now with attachment (wipes egg from face)> Hi, Add comments to pac207.c about what todays experiments have teached us about the pac207 compression. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans -- video4linux-list mailing list Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe https://www.redhat.com/mailman/listinfo/video4linux-list Add comments to pac207.c about what todays experiments have teached us about the pac207 compression. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> diff -r 61deeffda900 v4l2-apps/lib/libv4l/libv4lconvert/pac207.c --- a/v4l2-apps/lib/libv4l/libv4lconvert/pac207.c Fri Jul 04 07:21:55 2008 +0200 +++ b/v4l2-apps/lib/libv4l/libv4lconvert/pac207.c Fri Jul 04 13:06:08 2008 +0200 @@ -170,15 +170,12 @@ inp += pac_decompress_row(inp, outp, width); break; - default: + case 0x2DD2: /* prefix for "stronger" compressed lines, currently the + kernel driver programs the cam so that we should not + get any of these */ + + default: /* corrupt frame */ /* FIXME add error reporting */ - /* Notice this seems to happen with high framerates (low exposure - setting due to much light and bad compressible images, so most - likely the usb just cannot keep us and we miss parts of some - frames (sometimes of many frames in a row) messing things up - completely. It might be worth to try changing the compression - balance setting to see if that can compensate for this. - However currently I cannot reproduce this (no daylight) */ return; } outp += width;

1 0

PATCH: libv4l-pac207-comments.patch
by Hans de Goede 04 Jul '08

04 Jul '08

Hi, Add comments to pac207.c about what todays experiments have teached us about the pac207 compression. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans

1 0

PATCH: libv4l-sonix-license-permission.patch
by Hans de Goede 03 Jul '08

03 Jul '08

Hi All, Add license change (GPL -> LGPL) permission notice, and don't claim copyright over code I didn't write, instead add copyright header of the original author (oops) Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans

1 0

PATCH: libv
by Hans de Goede 03 Jul '08

03 Jul '08

Hi All, This patch adds support to libv4l for the compressed bayer format emitted by pac207 based cams. Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> Regards, Hans

2 3

Re: [V4l2-library] PATCH: Add support for sonix (sn9c10x) bayer compression to libv4lconvert
by Thierry Merle 03 Jul '08

03 Jul '08

Hans de Goede a écrit : > Hi, > > This patch adds support for sonix (sn9c10x) bayer compression to > libv4lconvert. > > Regards, > > Hans > Add support for sonix (sn9c10x) bayer compression to libv4lconvert > > Signed-off-by: Hans de Goede <j.w.r.degoede(a)hhs.nl> > diff -r e90ac66913c6 v4l2-apps/lib/libv4l/libv4lconvert/Makefile > --- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Thu Jul 03 13:54:53 2008 +0200 > +++ b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Thu Jul 03 14:19:49 2008 +0200 > @@ -9,7 +9,7 @@ > LDFLAGS = -shared > > CONVERT_LIB = libv4lconvert.so > -CONVERT_OBJS = libv4lconvert.o tinyjpeg.o \ > +CONVERT_OBJS = libv4lconvert.o tinyjpeg.o sn9c10x.o \ > jidctflt.o spca561-decompress.o rgbyuv.o spca501.o bayer.o > TARGETS = $(CONVERT_LIB) > INCLUDES = ../include/libv4lconvert.h > diff -r e90ac66913c6 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h > --- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h Thu Jul 03 13:54:53 2008 +0200 > +++ b/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h Thu Jul 03 14:19:49 2008 +0200 > @@ -71,6 +71,9 @@ > void v4lconvert_decode_spca561(const unsigned char *src, unsigned char *dst, > int width, int height); > > +void v4lconvert_decode_sn9c10x(const unsigned char *src, unsigned char *dst, > + int width, int height); > + > void v4lconvert_bayer_to_bgr24(const unsigned char *bayer, > unsigned char *rgb, int width, int height, unsigned int pixfmt); > > diff -r e90ac66913c6 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c > --- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Thu Jul 03 13:54:53 2008 +0200 > +++ b/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Thu Jul 03 14:19:49 2008 +0200 > @@ -37,6 +37,7 @@ > V4L2_PIX_FMT_SRGGB8, > V4L2_PIX_FMT_SPCA501, > V4L2_PIX_FMT_SPCA561, > + V4L2_PIX_FMT_SN9C10X, > -1 > }; > > @@ -314,23 +315,40 @@ > dest_fmt->fmt.pix.height); > break; > > + /* compressed bayer formats */ > case V4L2_PIX_FMT_SPCA561: > + case V4L2_PIX_FMT_SN9C10X: > { > - static unsigned char tmpbuf[640 * 480]; > - v4lconvert_decode_spca561(src, tmpbuf, dest_fmt->fmt.pix.width, > - dest_fmt->fmt.pix.height); > + unsigned char tmpbuf[dest_fmt->fmt.pix.width*dest_fmt->fmt.pix.height]; > + unsigned int bayer_fmt; > + > + switch (src_fmt->fmt.pix.pixelformat) { > + case V4L2_PIX_FMT_SPCA561: > + v4lconvert_decode_spca561(src, tmpbuf, dest_fmt->fmt.pix.width, > + dest_fmt->fmt.pix.height); > + bayer_fmt = V4L2_PIX_FMT_SGBRG8; > + break; > + case V4L2_PIX_FMT_SN9C10X: > + v4lconvert_decode_sn9c10x(src, tmpbuf, dest_fmt->fmt.pix.width, > + dest_fmt->fmt.pix.height); > + bayer_fmt = V4L2_PIX_FMT_SGBRG8; > + break; > + } > + > if (dest_fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_BGR24) > v4lconvert_bayer_to_bgr24(tmpbuf, dest, dest_fmt->fmt.pix.width, > - dest_fmt->fmt.pix.height, V4L2_PIX_FMT_SGBRG8); > + dest_fmt->fmt.pix.height, bayer_fmt); > else > v4lconvert_bayer_to_yuv420(tmpbuf, dest, dest_fmt->fmt.pix.width, > - dest_fmt->fmt.pix.height, V4L2_PIX_FMT_SGBRG8); > + dest_fmt->fmt.pix.height, bayer_fmt); > break; > } > + > case V4L2_PIX_FMT_BGR24: > /* dest must be V4L2_PIX_FMT_YUV420 then */ > printf("FIXME add bgr24 -> yuv420 conversion\n"); > break; > + > case V4L2_PIX_FMT_YUV420: > /* dest must be V4L2_PIX_FMT_BGR24 then */ > v4lconvert_yuv420_to_bgr24(src, dest, dest_fmt->fmt.pix.width, > diff -r e90ac66913c6 v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c Thu Jul 03 14:19:49 2008 +0200 > @@ -0,0 +1,199 @@ > +/* > +# (C) 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> > + > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU Lesser General Public License as published by > +# the Free Software Foundation; either version 2.1 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public License > +# along with this program; if not, write to the Free Software > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > +*/ > + > +#include "libv4lconvert-priv.h" > + > +/* FIXME FIXME FIXME add permission notice from Bertrik Sikken to release > + this code (which is his) under the LGPL */ > + > +#define CLAMP(x) ((x)<0?0:((x)>255)?255:(x)) > + > +typedef struct { > + int is_abs; > + int len; > + int val; > + int unk; > +} code_table_t; > + > + > +/* local storage */ > +/* FIXME not thread safe !! */ > +static code_table_t table[256]; > +static int init_done = 0; > + > +/* global variable */ > +static int sonix_unknown = 0; > + > +/* > + sonix_decompress_init > + ===================== > + pre-calculates a locally stored table for efficient huffman-decoding. > + > + Each entry at index x in the table represents the codeword > + present at the MSB of byte x. > + > +*/ > +void sonix_decompress_init(void) > +{ > + int i; > + int is_abs, val, len, unk; > + > + for (i = 0; i < 256; i++) { > + is_abs = 0; > + val = 0; > + len = 0; > + unk = 0; > + if ((i & 0x80) == 0) { > + /* code 0 */ > + val = 0; > + len = 1; > + } > + else if ((i & 0xE0) == 0x80) { > + /* code 100 */ > + val = +4; > + len = 3; > + } > + else if ((i & 0xE0) == 0xA0) { > + /* code 101 */ > + val = -4; > + len = 3; > + } > + else if ((i & 0xF0) == 0xD0) { > + /* code 1101 */ > + val = +11; > + len = 4; > + } > + else if ((i & 0xF0) == 0xF0) { > + /* code 1111 */ > + val = -11; > + len = 4; > + } > + else if ((i & 0xF8) == 0xC8) { > + /* code 11001 */ > + val = +20; > + len = 5; > + } > + else if ((i & 0xFC) == 0xC0) { > + /* code 110000 */ > + val = -20; > + len = 6; > + } > + else if ((i & 0xFC) == 0xC4) { > + /* code 110001xx: unknown */ > + val = 0; > + len = 8; > + unk = 1; > + } > + else if ((i & 0xF0) == 0xE0) { > + /* code 1110xxxx */ > + is_abs = 1; > + val = (i & 0x0F) << 4; > + len = 8; > + } > + table[i].is_abs = is_abs; > + table[i].val = val; > + table[i].len = len; > + table[i].unk = unk; > + } > + > + sonix_unknown = 0; > + init_done = 1; > +} > + > + > +/* > + sonix_decompress > + ================ > + decompresses an image encoded by a SN9C101 camera controller chip. > + > + IN width > + height > + inp pointer to compressed frame (with header already stripped) > + OUT outp pointer to decompressed frame > + > + Returns 0 if the operation was successful. > + Returns <0 if operation failed. > + > +*/ > +void v4lconvert_decode_sn9c10x(const unsigned char *inp, unsigned char *outp, > + int width, int height) > +{ > + int row, col; > + int val; > + int bitpos; > + unsigned char code; > + unsigned char *addr; > + > + if (!init_done) > + sonix_decompress_init(); > + > + bitpos = 0; > + for (row = 0; row < height; row++) { > + > + col = 0; > + > + /* first two pixels in first two rows are stored as raw 8-bit */ > + if (row < 2) { > + addr = inp + (bitpos >> 3); > + code = (addr[0] << (bitpos & 7)) | (addr[1] >> (8 - (bitpos & 7))); > + bitpos += 8; > + *outp++ = code; > + > + addr = inp + (bitpos >> 3); > + code = (addr[0] << (bitpos & 7)) | (addr[1] >> (8 - (bitpos & 7))); > + bitpos += 8; > + *outp++ = code; > + > + col += 2; > + } > + > + while (col < width) { > + /* get bitcode from bitstream */ > + addr = inp + (bitpos >> 3); > + code = (addr[0] << (bitpos & 7)) | (addr[1] >> (8 - (bitpos & 7))); > + > + /* update bit position */ > + bitpos += table[code].len; > + > + /* update code statistics */ > + sonix_unknown += table[code].unk; > + > + /* calculate pixel value */ > + val = table[code].val; > + if (!table[code].is_abs) { > + /* value is relative to top and left pixel */ > + if (col < 2) { > + /* left column: relative to top pixel */ > + val += outp[-2*width]; > + } > + else if (row < 2) { > + /* top row: relative to left pixel */ > + val += outp[-2]; > + } > + else { > + /* main area: average of left pixel and top pixel */ > + val += (outp[-2] + outp[-2*width]) / 2; > + } > + } > + > + /* store pixel */ > + *outp++ = CLAMP(val); > + col++; > + } > + } > +} > Applied on http://www.linuxtv.org/hg/~tmerle/v4l2-library Cheers, Thierry

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

V4L2-library July 2008