* [PATCH] Support for Elgato Video Capture
@ 2010-10-20 10:55 Adrian Taylor
2010-10-20 19:30 ` Jarod Wilson
0 siblings, 1 reply; 5+ messages in thread
From: Adrian Taylor @ 2010-10-20 10:55 UTC (permalink / raw)
To: linux-media
This patch allows this device successfully to show video, at least from
its composite input.
I have no information about the true hardware contents of this device and so
this patch is based solely on fiddling with things until it worked. The
chip appears to be em2860, and the closest device with equivalent inputs
is the Typhoon DVD Maker. Copying the settings for that device appears
to do the trick. That's what this patch does.
Signed-off-by: Adrian Taylor <adrian.taylor@realvnc.com>
---
drivers/media/video/em28xx/em28xx-cards.c | 16 ++++++++++++++++
drivers/media/video/em28xx/em28xx.h | 1 +
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c
b/drivers/media/video/em28xx/em28xx-cards.c
index 3a4fd85..5806f62 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1667,6 +1667,20 @@ struct em28xx_board em28xx_boards[] = {
.tuner_gpio = reddo_dvb_c_usb_box,
.has_dvb = 1,
},
+ [EM2860_BOARD_ELGATO_VIDEO_CAPTURE] = {
+ .name = "Elgato Video Capture",
+ .decoder = EM28XX_SAA711X,
+ .tuner_type = TUNER_ABSENT, /* Capture only device */
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ },
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1788,6 +1802,8 @@ struct usb_device_id em28xx_id_table[] = {
.driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
{ USB_DEVICE(0xeb1a, 0x50a6),
.driver_info = EM2860_BOARD_GADMEI_UTV330 },
+ { USB_DEVICE(0x0fd9, 0x0033),
+ .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},
{ },
};
MODULE_DEVICE_TABLE(usb, em28xx_id_table);
diff --git a/drivers/media/video/em28xx/em28xx.h
b/drivers/media/video/em28xx/em28xx.h
index b252d1b..23733b8 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -113,6 +113,7 @@
#define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73
#define EM2800_BOARD_VC211A 74
#define EM2882_BOARD_DIKOM_DK300 75
+#define EM2860_BOARD_ELGATO_VIDEO_CAPTURE 76
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Support for Elgato Video Capture
2010-10-20 10:55 [PATCH] Support for Elgato Video Capture Adrian Taylor
@ 2010-10-20 19:30 ` Jarod Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Jarod Wilson @ 2010-10-20 19:30 UTC (permalink / raw)
To: Adrian Taylor; +Cc: linux-media
On Oct 20, 2010, at 6:55 AM, Adrian Taylor wrote:
> This patch allows this device successfully to show video, at least from
> its composite input.
>
> I have no information about the true hardware contents of this device and so
> this patch is based solely on fiddling with things until it worked. The
> chip appears to be em2860, and the closest device with equivalent inputs
> is the Typhoon DVD Maker. Copying the settings for that device appears
> to do the trick. That's what this patch does.
>
> Signed-off-by: Adrian Taylor <adrian.taylor@realvnc.com>
Patch probably needs to be redone against the staging/v2.6.37 branch of the v4l/dvb media_tree, since there's already a device 76 there (I know, because I added it. ;). Simple update though. Otherwise, looks sane.
For reference:
http://git.linuxtv.org/media_tree.git?a=shortlog;h=refs/heads/staging/v2.6.37
http://git.linuxtv.org/media_tree.git?a=commitdiff;h=7e48b30af033076c85ab48a8306b5588faf5fb4b
> ---
> drivers/media/video/em28xx/em28xx-cards.c | 16 ++++++++++++++++
> drivers/media/video/em28xx/em28xx.h | 1 +
> 2 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
> index 3a4fd85..5806f62 100644
> --- a/drivers/media/video/em28xx/em28xx-cards.c
> +++ b/drivers/media/video/em28xx/em28xx-cards.c
> @@ -1667,6 +1667,20 @@ struct em28xx_board em28xx_boards[] = {
> .tuner_gpio = reddo_dvb_c_usb_box,
> .has_dvb = 1,
> },
> + [EM2860_BOARD_ELGATO_VIDEO_CAPTURE] = {
> + .name = "Elgato Video Capture",
> + .decoder = EM28XX_SAA711X,
> + .tuner_type = TUNER_ABSENT, /* Capture only device */
> + .input = { {
> + .type = EM28XX_VMUX_COMPOSITE1,
> + .vmux = SAA7115_COMPOSITE0,
> + .amux = EM28XX_AMUX_LINE_IN,
> + }, {
> + .type = EM28XX_VMUX_SVIDEO,
> + .vmux = SAA7115_SVIDEO3,
> + .amux = EM28XX_AMUX_LINE_IN,
> + } },
> + },
> };
> const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
>
> @@ -1788,6 +1802,8 @@ struct usb_device_id em28xx_id_table[] = {
> .driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
> { USB_DEVICE(0xeb1a, 0x50a6),
> .driver_info = EM2860_BOARD_GADMEI_UTV330 },
> + { USB_DEVICE(0x0fd9, 0x0033),
> + .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},
> { },
> };
> MODULE_DEVICE_TABLE(usb, em28xx_id_table);
> diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
> index b252d1b..23733b8 100644
> --- a/drivers/media/video/em28xx/em28xx.h
> +++ b/drivers/media/video/em28xx/em28xx.h
> @@ -113,6 +113,7 @@
> #define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73
> #define EM2800_BOARD_VC211A 74
> #define EM2882_BOARD_DIKOM_DK300 75
> +#define EM2860_BOARD_ELGATO_VIDEO_CAPTURE 76
>
> /* Limits minimum and default number of buffers */
> #define EM28XX_MIN_BUF 4
> --
> 1.7.0.4
--
Jarod Wilson
jarod@wilsonet.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Support for Elgato Video Capture.
@ 2010-10-22 11:30 Adrian Taylor
2010-10-22 13:25 ` Jarod Wilson
0 siblings, 1 reply; 5+ messages in thread
From: Adrian Taylor @ 2010-10-22 11:30 UTC (permalink / raw)
To: linux-media
This patch allows this device successfully to show video, at least from
its composite input.
I have no information about the true hardware contents of this device and so
this patch is based solely on fiddling with things until it worked. The
chip appears to be em2860, and the closest device with equivalent inputs
is the Typhoon DVD Maker. Copying the settings for that device appears
to do the trick. That's what this patch does.
Patch redone against the staging/v2.6.37 branch of the v4l/dvb
media_tree as requested.
Signed-off-by: Adrian Taylor <adrian.taylor@realvnc.com>
---
drivers/media/video/em28xx/em28xx-cards.c | 16 ++++++++++++++++
drivers/media/video/em28xx/em28xx.h | 1 +
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ffbe544..f4d39c6 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1693,6 +1693,20 @@ struct em28xx_board em28xx_boards[] = {
.dvb_gpio = kworld_a340_digital,
.tuner_gpio = default_tuner_gpio,
},
+ [EM2860_BOARD_ELGATO_VIDEO_CAPTURE] = {
+ .name = "Elgato Video Capture",
+ .decoder = EM28XX_SAA711X,
+ .tuner_type = TUNER_ABSENT, /* Capture only device */
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ },
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1816,6 +1830,8 @@ struct usb_device_id em28xx_id_table[] = {
.driver_info = EM2860_BOARD_GADMEI_UTV330 },
{ USB_DEVICE(0x1b80, 0xa340),
.driver_info = EM2870_BOARD_KWORLD_A340 },
+ { USB_DEVICE(0x0fd9, 0x0033),
+ .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},
{ },
};
MODULE_DEVICE_TABLE(usb, em28xx_id_table);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index adb20eb..4e878c2 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -116,6 +116,7 @@
#define EM2800_BOARD_VC211A 74
#define EM2882_BOARD_DIKOM_DK300 75
#define EM2870_BOARD_KWORLD_A340 76
+#define EM2860_BOARD_ELGATO_VIDEO_CAPTURE 77
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Support for Elgato Video Capture.
2010-10-22 11:30 Adrian Taylor
@ 2010-10-22 13:25 ` Jarod Wilson
2010-10-22 22:53 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 5+ messages in thread
From: Jarod Wilson @ 2010-10-22 13:25 UTC (permalink / raw)
To: Adrian Taylor; +Cc: linux-media
On Oct 22, 2010, at 7:30 AM, Adrian Taylor wrote:
> This patch allows this device successfully to show video, at least from
> its composite input.
>
> I have no information about the true hardware contents of this device and so
> this patch is based solely on fiddling with things until it worked. The
> chip appears to be em2860, and the closest device with equivalent inputs
> is the Typhoon DVD Maker. Copying the settings for that device appears
> to do the trick. That's what this patch does.
>
> Patch redone against the staging/v2.6.37 branch of the v4l/dvb
> media_tree as requested.
>
> Signed-off-by: Adrian Taylor <adrian.taylor@realvnc.com>
Looks good, thanks for the redo.
Reviewed-by: Jarod Wilson <jarod@redhat.com>
--
Jarod Wilson
jarod@wilsonet.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Support for Elgato Video Capture.
2010-10-22 13:25 ` Jarod Wilson
@ 2010-10-22 22:53 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 5+ messages in thread
From: Mauro Carvalho Chehab @ 2010-10-22 22:53 UTC (permalink / raw)
To: Jarod Wilson; +Cc: Adrian Taylor, linux-media
Em 22-10-2010 11:25, Jarod Wilson escreveu:
> On Oct 22, 2010, at 7:30 AM, Adrian Taylor wrote:
>
>> This patch allows this device successfully to show video, at least from
>> its composite input.
>>
>> I have no information about the true hardware contents of this device and so
>> this patch is based solely on fiddling with things until it worked. The
>> chip appears to be em2860, and the closest device with equivalent inputs
>> is the Typhoon DVD Maker. Copying the settings for that device appears
>> to do the trick. That's what this patch does.
>>
>> Patch redone against the staging/v2.6.37 branch of the v4l/dvb
>> media_tree as requested.
>>
>> Signed-off-by: Adrian Taylor <adrian.taylor@realvnc.com>
>
> Looks good, thanks for the redo.
>
> Reviewed-by: Jarod Wilson <jarod@redhat.com>
>
>
Thanks. Yet, I've renumbered it to 33, as we had this number free...
I think that the next free number is 59... It would be nice to
fill-in the blanks ;)
Cheers,
Mauro
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-22 22:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-20 10:55 [PATCH] Support for Elgato Video Capture Adrian Taylor
2010-10-20 19:30 ` Jarod Wilson
-- strict thread matches above, loose matches on Subject: below --
2010-10-22 11:30 Adrian Taylor
2010-10-22 13:25 ` Jarod Wilson
2010-10-22 22:53 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox