Commit 8298f2f8 authored by Adrian Taylor's avatar Adrian Taylor Committed by Mauro Carvalho Chehab
Browse files

[media] Support for Elgato Video Capture 



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.

[mchehab@redhat.com: update CARDLIST.em28xx accordingly, via script]
Signed-off-by: default avatarAdrian Taylor <adrian.taylor@realvnc.com>
Reviewed-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 69194aba

Documentation/video4linux/CARDLIST.em28xx

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 30 -> Videology 20K14XUSB USB2.0               (em2820/em2840)

 31 -> Usbgear VD204v9                          (em2821)

 32 -> Supercomp USB 2.0 TV                     (em2821)

 33 -> Elgato Video Capture                     (em2860)        [0fd9:0033]

 34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]

 35 -> Typhoon DVD Maker                        (em2860)

 36 -> NetGMBH Cam                              (em2860)
@@ -45,7 +46,7 @@ 
 45 -> Pinnacle PCTV DVB-T                      (em2870)

 46 -> Compro, VideoMate U3                     (em2870)        [185b:2870]

 47 -> KWorld DVB-T 305U                        (em2880)        [eb1a:e305]

 48 -> KWorld DVB-T 310U                        (em2880)        [eb1a:e310]

 48 -> KWorld DVB-T 310U                        (em2880)

 49 -> MSI DigiVox A/D                          (em2880)        [eb1a:e310]

 50 -> MSI DigiVox A/D II                       (em2880)        [eb1a:e320]

 51 -> Terratec Hybrid XS Secam                 (em2880)        [0ccd:004c]

drivers/media/video/em28xx/em28xx-cards.c

+18 −0
Original line number Diff line number Diff line
@@ -1660,6 +1660,22 @@ struct em28xx_board em28xx_boards[] = { 
			.gpio     = terratec_av350_unmute_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,

		} },

	},



	[EM2882_BOARD_EVGA_INDTUBE] = {

		.name         = "Evga inDtube",

		.tuner_type   = TUNER_XC2028,
@@ -1784,6 +1800,8 @@ struct usb_device_id em28xx_id_table[] = { 
			.driver_info = EM2860_BOARD_TERRATEC_AV350 },

	{ USB_DEVICE(0x0ccd, 0x0096),

			.driver_info = EM2860_BOARD_TERRATEC_GRABBY },

	{ USB_DEVICE(0x0fd9, 0x0033),

			.driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},

	{ USB_DEVICE(0x185b, 0x2870),

			.driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },

	{ USB_DEVICE(0x185b, 0x2041),

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#define EM2820_BOARD_VIDEOLOGY_20K14XUSB	  30

#define EM2821_BOARD_USBGEAR_VD204		  31

#define EM2821_BOARD_SUPERCOMP_USB_2		  32

#define EM2860_BOARD_ELGATO_VIDEO_CAPTURE	  33

#define EM2860_BOARD_TERRATEC_HYBRID_XS		  34

#define EM2860_BOARD_TYPHOON_DVD_MAKER		  35

#define EM2860_BOARD_NETGMBH_CAM		  36

CRA Git | Maintained and supported by SUSTech CRA and CCSE