Attachment 313392 Details for Bug 457796 – xawtv-3.95-v4l-conf-user-bpl.patch

[patch] xawtv-3.95-v4l-conf-user-bpl.patch

xawtv-3.95-v4l-conf-user-bpl.patch (text/plain), 2.40 KB, created by Hans de Goede on 2008-08-04 18:20:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2008-08-04 18:20:31 UTC

Size: 2.40 KB

patch

obsolete

>diff -up xawtv-3.95/console/v4l-conf.c~ xawtv-3.95/console/v4l-conf.c
>--- xawtv-3.95/console/v4l-conf.c~	2008-08-04 16:24:28.000000000 +0200
>+++ xawtv-3.95/console/v4l-conf.c	2008-08-04 16:45:07.000000000 +0200
>@@ -53,6 +53,7 @@ int    v4l1       = 1;
> int    v4l2       = 1;
> int    user_bpp   = 0;
> int    user_shift = 0;
>+int    user_bpl   = 0;
> void   *user_base = NULL;
> char   *display   = NULL;
> char   *fbdev     = NULL;
>@@ -385,7 +386,15 @@ displayinfo_v4l2(int fd, struct DISPLAYI
>     }
>     if (yuv)
> 	fb.fmt.pixelformat = V4L2_PIX_FMT_YUYV;
>-    fb.fmt.bytesperline = d->bpl;
>+    /* Prefer an already configured bpl (if it makes sense) over our found bpl
>+       if we did not find a base as our bpl is not very reliable when we did
>+       not find a base */
>+    if (user_bpl || d->base ||
>+            fb.fmt.bytesperline < (fb.fmt.width * ((d->bpp + 7) / 8)))
>+        fb.fmt.bytesperline = d->bpl;
>+    else
>+        fprintf(stderr,"WARNING: keeping fbuf pitch at: %d, as no base addr was detected\n",
>+            (int)fb.fmt.bytesperline);
>     fb.fmt.sizeimage = fb.fmt.height * fb.fmt.bytesperline;
>     if (NULL != d->base)
> 	fb.base   = d->base;
>@@ -506,7 +506,7 @@ main(int argc, char *argv[])
>     
>     /* parse options */
>     for (;;) {
>-	if (-1 == (c = getopt(argc, argv, "hyq12d:c:b:s:fa:")))
>+	if (-1 == (c = getopt(argc, argv, "hyq12d:c:b:s:fa:p:")))
> 	    break;
> 	switch (c) {
> 	case 'q':
>@@ -543,6 +551,14 @@ main(int argc, char *argv[])
> 		exit(1);
> 	    }
> 	    break;
>+	case 'p':
>+	    if (0 == getuid()) {
>+		sscanf(optarg,"%d",&user_bpl);
>+	    } else {
>+		fprintf(stderr,"only root is allowed to use the -p option\n");
>+		exit(1);
>+	    }
>+	    break;
> 	case 'h':
> 	default:
> 	    fprintf(stderr,
>@@ -560,6 +576,8 @@ main(int argc, char *argv[])
> 		    "    -a <addr> set framebuffer address to <addr>\n"
> 		    "              (in hex, root only, successful autodetect\n"
> 		    "               will overwrite this address)\n"
>+		    "    -p <pitch> set framebuffer pitch to <pitch> bytes\n"
>+		    "              (decimal, root only)\n"
> 		    "    -1        force v4l API\n"
> 		    "    -2        force v4l2 API\n",
> 		    argv[0],
>@@ -644,6 +644,9 @@ main(int argc, char *argv[])
> 	(d.depth  == 15 || d.depth  == 16))
> 	d.depth = user_bpp;
> 
>+    if (user_bpl)
>+        d.bpl = user_bpl;
>+
>     if (verbose) {
> 	fprintf(stderr,"mode: %dx%d, depth=%d, bpp=%d, bpl=%d, ",
> 		d.width,d.height,d.depth,d.bpp,d.bpl);

Actions: View | Diff

Attachments on bug 457796: 313380 | 313381 | 313382 | 313392