Re: go7007 driver -- which program you use for capture
Pete Eberlein wrote: > On Thu, 2010-01-14 at 15:03 -0500, TJ wrote: > >> Pete, Question: I was looking through the code and noticed that you turned >> s2250 >> driver into v4l2_subdev and go7007 driver initializes it as such and passes >> it >> calls via call_all (v4l2_device_call_until_err). How does that affect other >> drivers? Does that mean they all need to re-written as v4l2_subdev? > > That is correct. The other drivers do not work until they are all > converted to the subdev interface. I'm working on the other drivers > now. I've finished ov7640 and have started on saa7113. > > Once the subdev driver conversions are completed, we should be able to > move the go7007 driver out of staging. > > Pete > Cool man. I will start working on tw9903 and tw9906, as this is my main area of interest. Is there a template for subdev driver or should I just use your s2250 as an example? -TJ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
On Thu, 2010-01-14 at 15:03 -0500, TJ wrote: > Pete, Question: I was looking through the code and noticed that you turned > s2250 > driver into v4l2_subdev and go7007 driver initializes it as such and passes it > calls via call_all (v4l2_device_call_until_err). How does that affect other > drivers? Does that mean they all need to re-written as v4l2_subdev? That is correct. The other drivers do not work until they are all converted to the subdev interface. I'm working on the other drivers now. I've finished ov7640 and have started on saa7113. Once the subdev driver conversions are completed, we should be able to move the go7007 driver out of staging. Pete -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
Mauro Carvalho Chehab wrote: > It should be against -hg or linux-next tree, otherwise, I can't send it > upstream. > If you just want to send a patch for people to test, please mark it as RFC, > otherwise > I'll assume that you're sending a patch for upstream. > > Since there are more people working on this driver, the better is to add what > you > have there, to avoid people to do a similar work. OK my brother. I got a hold of the -hg tree and started working off of it. Pete, Question: I was looking through the code and noticed that you turned s2250 driver into v4l2_subdev and go7007 driver initializes it as such and passes it calls via call_all (v4l2_device_call_until_err). How does that affect other drivers? Does that mean they all need to re-written as v4l2_subdev? -TJ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
TJ wrote: > Mauro Carvalho Chehab wrote: >> TJ wrote: >>> jelle, that you? >>> >>> Here's the patch against go7007 driver in 2.6.32 kernel (run with -p1). >>> >>> The main purpose of the patch is to include support for ADS Tech DVD Xpress >>> DX2 >>> usb capture card and make it usable with v4l2-ctl utility. >>> >>> I also did a general clean-up in a few areas and *temporarily* added back in >>> proprietary go7007 ioctls, so current mythtv users can take advantage of it >>> and >>> to make the gorecord program from wis-go7007 package now work again. >>> >>> Also attached is a stripped down version of gorecord from which I removed >>> all >>> parameter-setting stuff. This version is meant to be used in conjunction >>> with >>> v4l2-ctl or other means of configuring capture parameters. >>> >>> I will try to do mythtv patches next so that it starts using standard v4l2 >>> ioctl >>> calls and we can drop all proprietary stuff in the driver. >>> >>> Please try it and lemme know if it works for you. I've run into a few >>> Ubuntuers >>> as well who were trying to get their boards working as well. >> The patch doesn't apply on the latest -hg version: >> patching file drivers/staging/go7007/Kconfig >> patching file drivers/staging/go7007/go7007-driver.c >> Hunk #2 succeeded at 225 (offset 1 line). >> Hunk #3 succeeded at 285 (offset 1 line). >> patching file drivers/staging/go7007/go7007-usb.c >> patching file drivers/staging/go7007/go7007-v4l2.c >> Hunk #1 FAILED at 43. >> Hunk #2 succeeded at 425 with fuzz 2 (offset 8 lines). >> Hunk #4 succeeded at 578 (offset 8 lines). >> Hunk #6 FAILED at 993. >> Hunk #7 succeeded at 1078 with fuzz 1 (offset -8 lines). >> Hunk #8 FAILED at 1538. >> Hunk #9 succeeded at 1672 (offset -18 lines). >> Hunk #10 succeeded at 1764 (offset -8 lines). >> 3 out of 10 hunks FAILED -- saving rejects to file >> drivers/staging/go7007/go7007-v4l2.c.rej >> patching file drivers/staging/go7007/s2250-board.c >> Hunk #1 FAILED at 357. >> 1 out of 1 hunk FAILED -- saving rejects to file >> drivers/staging/go7007/s2250-board.c.rej >> patching file drivers/staging/go7007/wis-i2c.h >> patching file drivers/staging/go7007/wis-saa7113.c >> patching file drivers/staging/go7007/wis-saa7115.c >> patching file drivers/staging/go7007/wis-tw2804.c >> patching file drivers/staging/go7007/wis-tw9903.c >> Hunk #1 FAILED at 152. >> 1 out of 1 hunk FAILED -- saving rejects to file >> drivers/staging/go7007/wis-tw9903.c.rej >> patching file drivers/staging/go7007/wis-tw9906.c >> Patch doesn't apply > > Mauro, brother, this patch is for in-kernel go7007 driver. It has to be run > against kernel source 2.6.32. (IIRC it will also run against 2.6.31) It should be against -hg or linux-next tree, otherwise, I can't send it upstream. If you just want to send a patch for people to test, please mark it as RFC, otherwise I'll assume that you're sending a patch for upstream. Since there are more people working on this driver, the better is to add what you have there, to avoid people to do a similar work. > It won't run against current v4l-dvb tree, as Pete has done quite a few > changes > since then. When I get a chance, I will start working against current version. > >> Also, you shouldn't re-add the proprietary API but, instead, to port it to >> use the >> API support for compressed stuff. > > I did add support for standard vidioc_s/g_ext_ctrls API stuff and that's what > I > am actually using currently. Ah, ok :) > I merely kept the proprietary ioctls so that mythtv > users can start using the driver as well until somebody (me?) patches mythtv > to > use the standard APIs. -TJ Ok. While it is still at -staging, we can keep the proprietary ioctls, but they need to be removed before moving to the right place. Cheers, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
Mauro Carvalho Chehab wrote: > TJ wrote: >> jelle, that you? >> >> Here's the patch against go7007 driver in 2.6.32 kernel (run with -p1). >> >> The main purpose of the patch is to include support for ADS Tech DVD Xpress >> DX2 >> usb capture card and make it usable with v4l2-ctl utility. >> >> I also did a general clean-up in a few areas and *temporarily* added back in >> proprietary go7007 ioctls, so current mythtv users can take advantage of it >> and >> to make the gorecord program from wis-go7007 package now work again. >> >> Also attached is a stripped down version of gorecord from which I removed all >> parameter-setting stuff. This version is meant to be used in conjunction with >> v4l2-ctl or other means of configuring capture parameters. >> >> I will try to do mythtv patches next so that it starts using standard v4l2 >> ioctl >> calls and we can drop all proprietary stuff in the driver. >> >> Please try it and lemme know if it works for you. I've run into a few >> Ubuntuers >> as well who were trying to get their boards working as well. > > The patch doesn't apply on the latest -hg version: > patching file drivers/staging/go7007/Kconfig > patching file drivers/staging/go7007/go7007-driver.c > Hunk #2 succeeded at 225 (offset 1 line). > Hunk #3 succeeded at 285 (offset 1 line). > patching file drivers/staging/go7007/go7007-usb.c > patching file drivers/staging/go7007/go7007-v4l2.c > Hunk #1 FAILED at 43. > Hunk #2 succeeded at 425 with fuzz 2 (offset 8 lines). > Hunk #4 succeeded at 578 (offset 8 lines). > Hunk #6 FAILED at 993. > Hunk #7 succeeded at 1078 with fuzz 1 (offset -8 lines). > Hunk #8 FAILED at 1538. > Hunk #9 succeeded at 1672 (offset -18 lines). > Hunk #10 succeeded at 1764 (offset -8 lines). > 3 out of 10 hunks FAILED -- saving rejects to file > drivers/staging/go7007/go7007-v4l2.c.rej > patching file drivers/staging/go7007/s2250-board.c > Hunk #1 FAILED at 357. > 1 out of 1 hunk FAILED -- saving rejects to file > drivers/staging/go7007/s2250-board.c.rej > patching file drivers/staging/go7007/wis-i2c.h > patching file drivers/staging/go7007/wis-saa7113.c > patching file drivers/staging/go7007/wis-saa7115.c > patching file drivers/staging/go7007/wis-tw2804.c > patching file drivers/staging/go7007/wis-tw9903.c > Hunk #1 FAILED at 152. > 1 out of 1 hunk FAILED -- saving rejects to file > drivers/staging/go7007/wis-tw9903.c.rej > patching file drivers/staging/go7007/wis-tw9906.c > Patch doesn't apply Mauro, brother, this patch is for in-kernel go7007 driver. It has to be run against kernel source 2.6.32. (IIRC it will also run against 2.6.31) It won't run against current v4l-dvb tree, as Pete has done quite a few changes since then. When I get a chance, I will start working against current version. > > Also, you shouldn't re-add the proprietary API but, instead, to port it to > use the > API support for compressed stuff. I did add support for standard vidioc_s/g_ext_ctrls API stuff and that's what I am actually using currently. I merely kept the proprietary ioctls so that mythtv users can start using the driver as well until somebody (me?) patches mythtv to use the standard APIs. -TJ > Cheers, > Mauro. > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
Pete Eberlein wrote: > On Fri, 2010-01-08 at 14:07 -0500, TJ wrote: >> Pete and anybody else out there with go7007 devices, what do you use for >> capture? > > I used a modified capture.c, based on > http://v4l2spec.bytesex.org/v4l2spec/capture.c OK good. >> Without GO7007 ioctls, I was only able to get vlc to capture in MJPEG format. > > Does VLC try to change video parameters after starting the stream? The > driver currently doesn't allow that. I think I've seen xawtv try to do > that too. I haven't messed with it much, but I think it just uses default driver settings. When I went to Advanced settings in vlc and tried to change some stuff, it didn't work at all. I ended up just hacking up gorecord from the original driver package and got it working that way. I would probably be worthwhile getting vlc to work with go7007. What do you think? -TJ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
TJ wrote: > jelle, that you? > > Here's the patch against go7007 driver in 2.6.32 kernel (run with -p1). > > The main purpose of the patch is to include support for ADS Tech DVD Xpress > DX2 > usb capture card and make it usable with v4l2-ctl utility. > > I also did a general clean-up in a few areas and *temporarily* added back in > proprietary go7007 ioctls, so current mythtv users can take advantage of it > and > to make the gorecord program from wis-go7007 package now work again. > > Also attached is a stripped down version of gorecord from which I removed all > parameter-setting stuff. This version is meant to be used in conjunction with > v4l2-ctl or other means of configuring capture parameters. > > I will try to do mythtv patches next so that it starts using standard v4l2 > ioctl > calls and we can drop all proprietary stuff in the driver. > > Please try it and lemme know if it works for you. I've run into a few > Ubuntuers > as well who were trying to get their boards working as well. The patch doesn't apply on the latest -hg version: patching file drivers/staging/go7007/Kconfig patching file drivers/staging/go7007/go7007-driver.c Hunk #2 succeeded at 225 (offset 1 line). Hunk #3 succeeded at 285 (offset 1 line). patching file drivers/staging/go7007/go7007-usb.c patching file drivers/staging/go7007/go7007-v4l2.c Hunk #1 FAILED at 43. Hunk #2 succeeded at 425 with fuzz 2 (offset 8 lines). Hunk #4 succeeded at 578 (offset 8 lines). Hunk #6 FAILED at 993. Hunk #7 succeeded at 1078 with fuzz 1 (offset -8 lines). Hunk #8 FAILED at 1538. Hunk #9 succeeded at 1672 (offset -18 lines). Hunk #10 succeeded at 1764 (offset -8 lines). 3 out of 10 hunks FAILED -- saving rejects to file drivers/staging/go7007/go7007-v4l2.c.rej patching file drivers/staging/go7007/s2250-board.c Hunk #1 FAILED at 357. 1 out of 1 hunk FAILED -- saving rejects to file drivers/staging/go7007/s2250-board.c.rej patching file drivers/staging/go7007/wis-i2c.h patching file drivers/staging/go7007/wis-saa7113.c patching file drivers/staging/go7007/wis-saa7115.c patching file drivers/staging/go7007/wis-tw2804.c patching file drivers/staging/go7007/wis-tw9903.c Hunk #1 FAILED at 152. 1 out of 1 hunk FAILED -- saving rejects to file drivers/staging/go7007/wis-tw9903.c.rej patching file drivers/staging/go7007/wis-tw9906.c Patch doesn't apply Also, you shouldn't re-add the proprietary API but, instead, to port it to use the API support for compressed stuff. Cheers, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
On Fri, 2010-01-08 at 14:07 -0500, TJ wrote:
> Pete and anybody else out there with go7007 devices, what do you use for
> capture?
I used a modified capture.c, based on
http://v4l2spec.bytesex.org/v4l2spec/capture.c
In the init_device(void) function, use:
fmt.type= V4L2_BUF_TYPE_VIDEO_CAPTURE;
switch (G_size) {
case 0:
fmt.fmt.pix.height = 640;
fmt.fmt.pix.width = 480;
break;
case 1:
fmt.fmt.pix.height = 320;
fmt.fmt.pix.width = 240;
break;
}
switch (type) {
case TYPE_MJPEG:
printf("MJPEG\n");
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_MJPEG;
break;
case TYPE_MPEG1:
case TYPE_MPEG2:
case TYPE_MPEG4:
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
break;
}
fmt.fmt.pix.field = V4L2_FIELD_ANY;
if (-1 == xioctl (fd, VIDIOC_S_FMT, &fmt))
errno_exit ("VIDIOC_S_FMT");
/* Note VIDIOC_S_FMT may change width and height. */
/* Buggy driver paranoia. */
min = fmt.fmt.pix.width * 2;
if (fmt.fmt.pix.bytesperline < min)
fmt.fmt.pix.bytesperline = min;
min = fmt.fmt.pix.bytesperline * fmt.fmt.pix.height;
if (fmt.fmt.pix.sizeimage < min)
fmt.fmt.pix.sizeimage = min;
/* optional MPEG parameters */
if( type != TYPE_MJPEG) {
struct v4l2_control ctrl;
ctrl.id = V4L2_CID_MPEG_VIDEO_ENCODING;
switch (type) {
case TYPE_MPEG1:
ctrl.value = V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
break;
case TYPE_MPEG2:
ctrl.value = V4L2_MPEG_VIDEO_ENCODING_MPEG_2;
break;
case TYPE_MPEG4:
ctrl.value = V4L2_MPEG_VIDEO_ENCODING_MPEG_4_SP;
break;
}
if (0 != xioctl (fd, VIDIOC_S_CTRL, &ctrl)) {
printf("could not set video encoding\n");
}
ctrl.id = V4L2_CID_MPEG_VIDEO_BITRATE;
ctrl.value = G_br;
if (0 != xioctl (fd, VIDIOC_S_CTRL, &ctrl)) {
printf("could not change bitrate\n");
}
}
> Without GO7007 ioctls, I was only able to get vlc to capture in MJPEG format.
Does VLC try to change video parameters after starting the stream? The
driver currently doesn't allow that. I think I've seen xawtv try to do
that too.
Pete
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: go7007 driver -- which program you use for capture
jelle, that you?
Here's the patch against go7007 driver in 2.6.32 kernel (run with -p1).
The main purpose of the patch is to include support for ADS Tech DVD Xpress DX2
usb capture card and make it usable with v4l2-ctl utility.
I also did a general clean-up in a few areas and *temporarily* added back in
proprietary go7007 ioctls, so current mythtv users can take advantage of it and
to make the gorecord program from wis-go7007 package now work again.
Also attached is a stripped down version of gorecord from which I removed all
parameter-setting stuff. This version is meant to be used in conjunction with
v4l2-ctl or other means of configuring capture parameters.
I will try to do mythtv patches next so that it starts using standard v4l2 ioctl
calls and we can drop all proprietary stuff in the driver.
Please try it and lemme know if it works for you. I've run into a few Ubuntuers
as well who were trying to get their boards working as well.
-TJ
Jarod Wilson wrote:
> On Fri, Jan 8, 2010 at 2:07 PM, TJ wrote:
>> Pete and anybody else out there with go7007 devices, what do you use for
>> capture?
>>
>> Without GO7007 ioctls, I was only able to get vlc to capture in MJPEG format.
>
> Never actually used one myself, but MythTV has support for at least
> the Plextor ConvertX go7007-based devices.
>
diff -U 3 -H -d -I' ' -x' .*' -r -N --
linux-2.6.32-gentoo/drivers/staging/go7007/Kconfig
linux-2.6.32-gentoo_DX2/drivers/staging/go7007/Kconfig
--- linux-2.6.32-gentoo/drivers/staging/go7007/Kconfig 2010-01-08
16:20:20.0 -0500
+++ linux-2.6.32-gentoo_DX2/drivers/staging/go7007/Kconfig 2010-01-08
10:24:34.0 -0500
@@ -77,6 +77,16 @@
To compile this driver as a module, choose M here: the
module will be called wis-tw9903
+config VIDEO_GO7007_TW9906
+ tristate "TW9906 subdev support"
+ depends on VIDEO_GO7007
+ default N
+ ---help---
+ This is a video4linux driver for the TW9906 sub-device.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wis-tw9906
+
config VIDEO_GO7007_UDA1342
tristate "UDA1342 subdev support"
depends on VIDEO_GO7007
diff -U 3 -H -d -I' ' -x' .*' -r -N --
linux-2.6.32-gentoo/drivers/staging/go7007/go7007-driver.c
linux-2.6.32-gentoo_DX2/drivers/staging/go7007/go7007-driver.c
--- linux-2.6.32-gentoo/drivers/staging/go7007/go7007-driver.c 2010-01-08
16:20:20.0 -0500
+++ linux-2.6.32-gentoo_DX2/drivers/staging/go7007/go7007-driver.c
2010-01-08 10:24:34.0 -0500
@@ -170,6 +171,17 @@
/* Set GPIO pin 0 to be an output (audio clock control) */
go7007_write_addr(go, 0x3c82, 0x0001);
go7007_write_addr(go, 0x3c80, 0x00fe);
+ break;
+ case GO7007_BOARDID_ADS_USBAV_709:
+ /* GPIO pin 0: audio clock control */
+ /* pin 2: TW9906 reset */
+ /* pin 3: capture LED */
+ go7007_write_addr(go, 0x3c82, 0x000d);
+ go7007_write_addr(go, 0x3c80, 0x00f2);
+ break;
+ default:
+ /* No special setup */
+ break;
}
return 0;
}
@@ -212,6 +224,9 @@
case I2C_DRIVERID_WIS_TW9903:
modname = "wis-tw9903";
break;
+ case I2C_DRIVERID_WIS_TW9906:
+ modname = "wis-tw9906";
+ break;
case I2C_DRIVERID_WIS_TW2804:
modname = "wis-tw2804";
break;
@@ -269,6 +284,12 @@
go->i2c_adapter_online = 1;
}
if (go->i2c_adapter_online) {
+ if (go->board_id == GO7007_BOARDID_ADS_USBAV_709) {
+ /* Reset the TW9906 */
+ go7007_write_addr(go, 0x3c82, 0x0009);
+ msleep(50);
+ go7007_write_addr(go, 0x3c82, 0x000d);
+ }
for (i = 0; i < go->board_info->num_i2c_devs; ++i)
init_i2c_module(&go->i2c_adapter,
go->board_info->i2c_devs[i].type,
diff -U 3 -H -d -I' ' -x' .*' -r -N --
linux-2.6.32-gentoo/drivers/staging/go7007/go7007-usb.c
linux-2.6.32-gentoo_DX2/drivers/staging/go7007/go7007-usb.c
--- linux-2.6.32-gentoo/drivers/staging/go7007/go7007-usb.c 2010-01-08
16:20:20.0 -0500
+++ linux-2.6.32-gentoo_DX2/drivers/staging/go7007/go7007-usb.c 2010-01-08
10:24:34.0 -0500
@@ -444,6 +444,44 @@
},
};
+static struct go7007_usb_board board_ads_usbav_709 = {
+ .flags = GO7007_USB_EZUSB,
+ .main_info = {
+ .firmware= "go7007tv.bin",
+ .flags = GO7007_BOARD_HAS_AUDIO |
+ GO7007_BOARD_USE_ONBOARD_I2C,
+ .audio_flags = GO7007_AUDIO_I2S_MODE_1 |
+ GO7007_AUDIO_I2S_
Re: go7007 driver -- which program you use for capture
On Fri, Jan 8, 2010 at 2:07 PM, TJ wrote: > Pete and anybody else out there with go7007 devices, what do you use for > capture? > > Without GO7007 ioctls, I was only able to get vlc to capture in MJPEG format. Never actually used one myself, but MythTV has support for at least the Plextor ConvertX go7007-based devices. -- Jarod Wilson ja...@wilsonet.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
go7007 driver -- which program you use for capture
Pete and anybody else out there with go7007 devices, what do you use for capture? Without GO7007 ioctls, I was only able to get vlc to capture in MJPEG format. -TJ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
