diff -ru xawtv-3.74/Changes xawtv-3.74.mga/Changes --- xawtv-3.74/Changes Wed Apr 10 11:47:37 2002 +++ xawtv-3.74.mga/Changes Sun Apr 14 13:18:57 2002 @@ -1,3 +1,10 @@ +3.74 => 3.74.mga +================ + + * Added patches originally from ftp://mjpeg.sourceforge.net/pub/mjpeg/ + (although that URL doesn't work anymore) to make xawtv work nicely with + the Matrox G450eTV [Paul Slootman ] + I'll make it a runtime option sometime. 3.73 => 3.74 ============ diff -ru xawtv-3.74/debian/changelog xawtv-3.74.mga/debian/changelog --- xawtv-3.74/debian/changelog Wed Apr 10 12:30:46 2002 +++ xawtv-3.74.mga/debian/changelog Sun Apr 14 13:17:18 2002 @@ -1,3 +1,9 @@ +xawtv (3.74.mga) unstable; urgency=low + + * patches to work nicely with Matrox G450eTV + + -- Paul Slootman Sun, 14 Apr 2002 13:16:42 +0200 + xawtv (3.74) unstable; urgency=low * new release (closes: #135393). diff -ru xawtv-3.74/common/commands.c xawtv-3.74.mga/common/commands.c --- xawtv-3.74/common/commands.c Tue Mar 26 14:16:46 2002 +++ xawtv-3.74.mga/common/commands.c Sun Apr 14 13:14:57 2002 @@ -992,8 +992,13 @@ /* size */ memset(&fmt,0,sizeof(fmt)); fmt.fmtid = VIDEO_RGB24; + /* MGA VIDEO + "Because the Marvel is only "perfect" at fullsize, we can nicely fix + everyting to grab good images" - Ian fmt.width = 2048; - fmt.height = 1572; + fmt.height = 1572; */ + fmt.width = 720; + fmt.height = 576; if (argc > 1) { if (0 == strcasecmp(argv[1],"full")) { /* nothing */ diff -ru xawtv-3.74/libng/grab-ng.c xawtv-3.74.mga/libng/grab-ng.c --- xawtv-3.74/libng/grab-ng.c Mon Apr 8 13:02:57 2002 +++ xawtv-3.74.mga/libng/grab-ng.c Sun Apr 14 13:13:04 2002 @@ -28,7 +28,9 @@ #include "grab-ng.h" int ng_debug = 0; -int ng_chromakey = 0x00ff00ff; +/* MGA VIDEO + Use a blue chroma key. */ +int ng_chromakey = 0x000000ff; int ng_jpeg_quality = 75; int ng_ratio_x = 4; int ng_ratio_y = 3; diff -ru xawtv-3.74/libng/plugins/drv1-v4l.c xawtv-3.74.mga/libng/plugins/drv1-v4l.c --- xawtv-3.74/libng/plugins/drv1-v4l.c Mon Apr 8 13:07:35 2002 +++ xawtv-3.74.mga/libng/plugins/drv1-v4l.c Sun Apr 14 13:13:04 2002 @@ -802,6 +802,11 @@ fprintf(stderr,"v4l: %dx%d, %d bit/pixel, %d byte/scanline\n", h->fbuf.width,h->fbuf.height, h->fbuf.depth,h->fbuf.bytesperline); + /* MGA VIDEO + DGA will report correct spanned resolution under Xinerama but V4L + will not. This will cause Xawtv to disable overlay. We can bypass + this check since overlay is safe on MGA hardware. + if ((fmt->bytesperline > 0 && h->fbuf.bytesperline != fmt->bytesperline) || (h->fbuf.width != fmt->width) || @@ -811,6 +816,7 @@ "WARNING: Is v4l-conf installed correctly?\n"); h->ov_error = 1; } + */ if (ng_vfmt_to_depth[fmt->fmtid] != ((h->fbuf.depth+7)&0xf8)) { fprintf(stderr, "WARNING: v4l and x11 disagree about the color depth\n" @@ -891,7 +897,10 @@ h->win.width = fmt->width; h->win.height = fmt->height; h->win.flags = 0; +/* MGA VIDEO h->win.chromakey = 0; + Use a blue chromakey. */ + h->win.chromakey = 0x000000ff; /* check against max. size */ xioctl(h->fd,VIDIOCGCAP,&h->capability); @@ -908,9 +917,11 @@ #if 1 /* pass aligned values -- the driver does'nt get it right yet */ + /* MGA VIDEO + "It looks like bug in rounding in division by 4." - Leon h->win.width &= ~3; h->win.height &= ~3; - h->win.x &= ~3; + h->win.x &= ~3; */ if (h->win.x < x) h->win.x += 4; if (h->win.x+h->win.width > x+fmt->width)