This pull request is identical to the REVIEWv2 patch series I posted earlier:
http://www.spinics.net/lists/linux-media/msg59944.html The only change (besides rebasing) is that patch 04/19 was moved to the end of the patch series. More about that patch below. This patch series updates bttv and tda7432 (a prerequisite of bttv) to the latest v4l2 frameworks, except for vb2 (as usual). Conversion to vb2 is something for the future. This patch series has been tested with the following bttv cards: Simple gpio-audio-based bttv card types: 39, 77, 41, 33 msp34xx based card types: 10 (with msp3410d) 1 (with msp3410c) tvaudio based card types: 40 (with tda7432, tea6420 and tda9850) The last one is now finally working. I doubt audio has worked at all in the last few years for that card. I'm pretty pleased about this to be honest :-) It turns out that the frequency handling in the current driver is partially broken (see this thread: http://www.mail-archive.com/linux-media@vger.kernel.org/msg58548.html). This is now fixed as a consequence of these compliancy patches. It's something v4l2-compliance found immediately, so this once again shows the importance of using v4l2-compliance to test fixes. While most patches are pretty standard for such conversions the last patch needs some more background: The current driver does not implement enumaudio (so apps cannot tell that audio inputs are present), it does not set V4L2_CAP_AUDIO, nor does it set audioset when calling ENUM_INPUT. And G_AUDIO doesn't set the stereo flag either. So these g/s_audio ioctls are quite pointless and misleading. Especially since some surveillance boards do not have audio at all. So I decided to remove them. But after a question about this from Frank Schäfer I investigated what would be needed to correctly implement s/g/enumaudio. So I made a second bttv branch which is identical to this one, except that the last patch is replaced by two new patches adding proper s/g/enumaudio support: http://git.linuxtv.org/hverkuil/media_tree.git/shortlog/refs/heads/bttv-audio However, this patch relies on the audio_inputs field (currently commented out) of the card definition, and I have serious doubts about the reliability of that field. A wrong number is not a problem in itself as audio will remain working, it is just that ENUMAUDIO will give wrong results. So there are three options: 1) keep the current situation: i.e. apply just the first 18 patches and skip the last. I'm not in favor of this myself. 2) remove the g/s_audio ioctls. At least this makes the driver consistent with the V4L2 API. And adding the enumaudio support can always be done later. 3) use the bttv-audio branch and implement proper enumaudio support and just accept that enumaudio can return incorrect results if the card definition is wrong. I am undecided which of options 2 or 3 is better. I'm leaning slightly towards option 2, but there is much to be said for 3 as well. So I am leaving it to you, Mauro, since you are the bttv maintainer anyway :-) Regards, Hans The following changes since commit ed72d37a33fdf43dc47787fe220532cdec9da528: [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff) (2013-02-13 18:05:29 -0200) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git bttv for you to fetch changes up to b26d6e39030e6ca2812bc8a818645169e6783ec9: bttv: remove g/s_audio since there is only one audio input. (2013-02-15 10:56:48 +0100) ---------------------------------------------------------------- Hans Verkuil (19): bttv: fix querycap and radio v4l2-compliance issues. bttv: add VIDIOC_DBG_G_CHIP_IDENT bttv: fix ENUM_INPUT and S_INPUT bttv: disable g/s_tuner and g/s_freq when no tuner present, fix return codes. bttv: set initial tv/radio frequencies bttv: G_PARM: set readbuffers. bttv: fill in colorspace. bttv: fill in fb->flags for VIDIOC_G_FBUF bttv: fix field handling inside TRY_FMT. tda7432: convert to the control framework bttv: convert to the control framework. bttv: add support for control events. bttv: fix priority handling. bttv: use centralized std and implement g_std. bttv: there may be multiple tvaudio/tda7432 devices. bttv: fix g_tuner capabilities override. bttv: fix try_fmt_vid_overlay and setup initial overlay size. bttv: do not switch to the radio tuner unless it is accessed. bttv: remove g/s_audio since there is only one audio input. drivers/media/i2c/tda7432.c | 276 +++++++--------- drivers/media/i2c/tvaudio.c | 2 +- drivers/media/pci/bt8xx/bttv-cards.c | 19 +- drivers/media/pci/bt8xx/bttv-driver.c | 1144 ++++++++++++++++++++++++++++--------------------------------------- drivers/media/pci/bt8xx/bttv.h | 3 + drivers/media/pci/bt8xx/bttvp.h | 31 +- include/media/v4l2-chip-ident.h | 8 + include/uapi/linux/v4l2-controls.h | 5 + 8 files changed, 632 insertions(+), 856 deletions(-) -- 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
