summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2006-06-25merge: http://linuxtv.org/hg/~mkrufky/blackbirdMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25cx88-blackbird: implement VIDIOC_LOG_STATUSMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> implemented VIDIOC_LOG_STATUS in the cx88-blackbird driver to show the status of i2c clients and the cx23416 mpeg encoder. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-25Update this driver for recent header file movement.Mauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25usb input headers changed to 2.6.18Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25Sync changes with alsa stuff at kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-24make VIDEO_CX88_BLACKBIRD a separate build optionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch creates a new Kconfig menu option, entitled, "Blackbird MPEG encoder support (cx2388x + cx23416)" so that the cx88-blackbird mpeg encoder module can be chosen separately. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24make VIDEO_CX2341X a selectable build optionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The cx2341x mpeg encoder module is used by cx88-blackbird, pvrusb2 and the external ivtv driver. This patch allows for cx2341x to be selected without having to also select cx88-blackbird. This will be needed to build the external ivtv driver or the standalone pvrusb2 driver against kernel 2.6.18 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24cx88: cleanupsMichael Krufky
From: Adrian Bunk <bunk@stusta.de> remove the following unused hooks: - cx88-blackbird.c: cx88_ioctl_hook() - cx88-blackbird.c: cx88_ioctl_translator() make the following needlessly global functions static: - cx88-tvaudio.c: cx88_detect_nicam() remove the following unused EXPORT_SYMBOL's: - cx88-cards.c: cx88_bcount - cx88-cards.c: cx88_subids - cx88-cards.c: cx88_idcount - cx88-cards.c: cx88_card_list - cx88-cards.c: cx88_card_setup - cx88-core.c: cx88_start_audio_dma - cx88-core.c: cx88_stop_audio_dma - cx88-i2c.c: cx88_i2c_init Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24Add V4L2_CID_MPEG_STREAM_VBI_FMT controlHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> V4L2_CID_MPEG_STREAM_VBI_FMT controls if and how VBI data is embedded in an MPEG stream. Currently only one format is supported: the format designed for the ivtv driver. This should be extended with new standard formats (such as defined for DVB) in the future. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-24Always switch tuner mode when calling VIDIOC_S_FREQUENCY.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Fixes the weird and incorrect condition in VIDIOC_S_FREQUENCY. The tuner should always be switched to the mode specified in the v4l2_frequency struct. Much simpler and also corresponding to the v4l2 specification. The old condition made it impossible to switch from radio to analog tv mode using VIDIOC_S_FREQUENCY. Instead the (tv) frequency would be given to the radio tuner. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-24Whitespace cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: http://linuxtv.org/hg/~mkrufky/mpeg-apiMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Merge tda9887 module into tuner.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Most uses a tda988[5/6/7] IF demodulator as part of the device. Having this as a separate stuff makes harder to configure it, since there are some tda9887 options that are tuner-dependent and should be bound into tuner-types structures. This patch merges tda9887 module into tuner. More work is required to make tuner-types to properly use it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: http://linuxtv.org/hg/~hverkuil/mpeg-apiMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: http://www.linuxtv.org/hg/~manu/v4l-algoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Fix use-after-free bug in cpia2 driverMauro Carvalho Chehab
From: Jesper Juhl <jesper.juhl@gmail.com> The coverity checker detected a use-after-free error in drivers/media/video/cpia2/cpia2_v4l.c::cpia2_close() (coverity error #1281). What happens is that we lock cam->busy_lock, then proceed to free resources, and in the case of (--cam->open_count == 0) we finish off by doing a kfree(cam) and then at the end of the function we do a mutex_unlock(&cam->busy_lock) which will explode since it'll dereference the free'd `cam' : ... mutex_lock(&cam->busy_lock); ... if (--cam->open_count == 0) { ... if (!cam->present) { video_unregister_device(dev); kfree(cam); } } mutex_unlock(&cam->busy_lock); <--- PROBLEM, cam no longer around. ... Since this only happens in the case of open_count going down to zero I don't see a problem with just releasing the mutex after unregistering the device and just before the kfree(). In this case there is nothing around that we can race against; we are in the release method, open_count is zero, (!cam->present) and the device has just been unregistered, so letting go of the mutex at this point looks safe to me. Patch below to implement that solution. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: http://linuxtv.org/hg/~mkrufky/cx88Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23fix userbits debug printsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Previously, it were showing the pointer value, instead of the setted bits. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23drivers/media/video/pwc/: make code staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch makes the following needlessly global code static: - pwc-ctrl.c: pwc_get_leds() - pwc_preferred_compression Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23drivers/media/video/vivi.c: make 2 functions staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> Make two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22cx88: clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audioMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audio streaming in both raw video and blackbird mpeg encoder modes. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-22cx88-blackbird: always set encoder height based on tvnorm->idMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Removed the switch..case block in blackbird_probe for setting encoder height based on video standard. All blackbird devices can rely on tvnorm->id to retrieve this information from the cx2388x video decoder - tuner_formats should not be used to determine the encoding video standard. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-22Add support for the DNTV Live! mini DVB-T card.Manu Abraham
From: Cameron Hutchinson <camh@xdna.net> Signed-off-by: Cameron Hutchinson <camh@xdna.net>
2006-06-21CX2341X port was always set to 'memory', but 'streaming' is also possibleHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> ivtv uses the memory (DMA) interface with the CX2341X, while pvrusb2 and cx88-blackbird use the streaming interface. This setting is now selectable by the driver. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-21cx88: add support for FusionHDTV 3 Gold (original revision)Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Add support for FusionHDTV 3 Gold (original revision), using the card definition for FusionHDTV3 Gold-Q Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-21merge: http://linuxtv.org/hg/~rmcc/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20kconfig: saa7115 depends on VIDEO_DEV, not VIDEO_V4l1Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> ... another leftover bug from a previous merge Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20Kconfig: fix description for saa7115 moduleMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This Kconfig description is incorrect, due to a previous merge a while back. CONFIG_SAA711X builds module saa7115, which is the newer module, and is not obsoleted. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20Ovcamship position at Kconfig changedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Ovcamship is used only on some USB webcams (OV511 and W9968CF) Bettet to leave this item just after those webcams. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20Whitespace cleanupsMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-19saa7134 card (LifeView3000 NTSC)Mauro Carvalho Chehab
From: Zac Bowling <zac@zacbowling.com> Add detection for the LifeView3000 NTSC model (right now the PAL version is the only one in there, which is sort of annoying for me living in the US and all.. sigh...) This is one of those things that I like to classify "as a works for me so take it or leave it" :-) . Not that worried because its an $18 video capture card that didn't look it was selling to well in the US, but then again who knows. The documentation needs updating too I bet but its behind anyways usually to what is in the code. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Zac Bowling <zac@zacbowling.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-06-19Disable bitrate_mode when encoding mpeg-1.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> MPEG-1 always uses CBR, so make the BITRATE_MODE control inactive. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-19Add cx2341x-specific control array to cx2341x.cHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-19cx88-tvaudio.c must #include <linux/config.h>Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-19Backed out changeset e3215d345e206c37b4a72a6f41d0a8c6696de3faMichael Krufky
2006-06-18Put old MPEGCOMP API under #if __KERNEL__ and issue warnings when used.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Port new MPEG API to saa7134-empress with saa6752hsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Port cx88-blackbird to the new MPEG API.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Use control helpers for saa7115, cx25840, msp3400.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Replace hardcoded control description by the standard ones supplied by v4l2-common. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Add CX2341X MPEG encoder module.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Adds the cx2341x.c module that handles the programming of the Conexant cx23415/6 MPEG encoder chip used by cx88-blackbird, pvrusb2 and ivtv. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Add helper functions for control processing to v4l2-common.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Control processing is often duplicated in the various drivers. Unfortunately, simple things like the names of controls are often different between drivers, even though it is the same controls. Adding in the new extended controls and the need for having control helper functions became apparent. Several functions have now been added to v4l2-common to do things like filling the v4l2_queryctrl and v4l2_querymenu structs, to check for valid control input and to move to the next control when enumerating over all controls. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> videodev.c copies the control list specified in struct v4l2_ext_controls to kernel space. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-18Use saner defaults for cx88 contrastRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> The default value for contrast in cx88 cards was 25%; this worked OK, except when applications enforced their own defaults (like MythTV), and it was different from other defaults (Hue/Brightness/Saturation) that used 50%. The value for contrast has been offset so the default is now 50% (as with other controls), giving the same result as the previous 25% setting. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Don't kill cx88 DMA sound on channel changeRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> There's a call at cx88-tvaudio to reset DMA sound on channel change; that call was killing cx88-alsa whenever the channel was changed, resulting in no sound. Remove those calls if cx88-alsa is selected to be compiled. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Fix cx88-alsa vs IRQ remote conflictRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> cx88-alsa was resetting the card on load, causing the IRQ IR handler to go away (maybe others, too). There's no actual need to reset the card, though, so that line was removed Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Fix card cx88 #50 remoteRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> There was an unmasked bit in the keycodes that was causing random behaviour (the code could be N or N+1). Masked that bit now. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-17Fix: videodev.c were cleaning the pointer, not the valuesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Small bug in saa7127.cMauro Carvalho Chehab
From: Jose Alberto Reguero <jareguero@telefonica.net> Fix wrong wss debug info. Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Remove non-functional local version of v4l_printk_ioctl()Mauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Remove code that tries to handle backward compatibility for v4l_printk_ioctl(), but ironically has the opposite effect. For kernels < 2.6.16, a local version of v4l_printk_ioctl(), which doesn't even compile, is removed. For kernels >= 2.6.16, the unnecessary extern prototype is removed, as the function is prototyped in media/v4l2-common.h. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>