Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2183a588 · Linus Torvalds <[email protected]> · 2014-12-11 11:49:23 -08:00

Pull media updates from Mauro Carvalho Chehab:
 - Two new dvb frontend drivers: mn88472 and mn88473
 - A new driver for some PCIe DVBSky cards
 - A new remote controller driver: meson-ir
 - One LIRC staging driver got rewritten and promoted to mainstream:
   igorplugusb
 - A new tuner driver (m88rs6000t)
 - The old omap2 media driver got removed from staging.  This driver
   uses an old DMA API and it is likely broken on recent kernels.
   Nobody cared enough to fix it
 - Media bus format moved to a separate header, as DRM will also use the
   definitions there
 - mem2mem_testdev were renamed to vim2m, in order to use the same
   naming convention taken by the other virtual test driver (vivid)
 - Added a new driver for coda SoC (coda-jpeg)
 - The cx88 driver got converted to use videobuf2 core
 - Make DMABUF export buffer to work with DMA Scatter/Gather and Vmalloc
   cores
 - Lots of other fixes, improvements and cleanups on the drivers.

* tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (384 commits)
  [media] mn88473: One function call less in mn88473_init() after error
  [media] mn88473: Remove uneeded check before release_firmware()
  [media] lirc_zilog: Deletion of unnecessary checks before vfree()
  [media] MAINTAINERS: Add myself as img-ir maintainer
  [media] img-ir: Don't set driver's module owner
  [media] img-ir: Depend on METAG or MIPS or COMPILE_TEST
  [media] img-ir/hw: Drop [un]register_decoder declarations
  [media] img-ir/hw: Fix potential deadlock stopping timer
  [media] img-ir/hw: Always read data to clear buffer
  [media] redrat3: ensure dma is setup properly
  [media] ddbridge: remove unneeded check before dvb_unregister_device()
  [media] si2157: One function call less in si2157_init() after error
  [media] tuners: remove uneeded checks before release_firmware()
  [media] arm: omap2: rx51-peripherals: fix build warning
  [media] stv090x: add an extra protetion against buffer overflow
  [media] stv090x: Remove an unreachable code
  [media] stv090x: Some whitespace cleanups
  [media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups
  [media] si2168: add support for firmware files in new format
  [media] si2168: debug printout for firmware version
  ...

Commit: 2183a58803c2bbd87c2d0057eed6779ec4718d4d
Parents: e28870f9 · 71947828

Merge commit. Changes below are compared with the first parent: e28870f9.

Changes

416 files changed · +16517 −13239

File	Status	Add	Del	Content
Documentation/DocBook/media/dvb/dvbproperty.xml	modified	+2	−2	View file
Documentation/DocBook/media/v4l/biblio.xml	modified	+85	−0	View file
Documentation/DocBook/media/v4l/dev-subdev.xml	modified	+63	−46	View file
Documentation/DocBook/media/v4l/io.xml	modified	+4	−1	View file
Documentation/DocBook/media/v4l/pixfmt.xml	modified	+967	−307	View file
Documentation/DocBook/media/v4l/selections-common.xml	modified	+16	−0	View file
Documentation/DocBook/media/v4l/subdev-formats.xml	modified	+154	−154	View file
Documentation/DocBook/media/v4l/vidioc-enuminput.xml	modified	+8	−0	View file
Documentation/DocBook/media/v4l/vidioc-enumoutput.xml	modified	+8	−0	View file
Documentation/devicetree/bindings/media/meson-ir.txt	added	+14	−0	View file
Documentation/devicetree/bindings/media/si4713.txt	added	+30	−0	View file
Documentation/video4linux/CARDLIST.cx23885	modified	+2	−0	View file
Documentation/video4linux/CARDLIST.em28xx	modified	+1	−0	View file
Documentation/video4linux/CARDLIST.saa7134	modified	+1	−0	View file
Documentation/video4linux/soc-camera.txt	modified	+1	−1	View file
MAINTAINERS	modified	+41	−0	View file
arch/arm/boot/dts/meson.dtsi	modified	+7	−0	View file
arch/arm/mach-davinci/board-dm355-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm365-evm.c	modified	+2	−2	View file
arch/arm/mach-davinci/dm355.c	modified	+3	−4	View file
arch/arm/mach-davinci/dm365.c	modified	+3	−4	View file
arch/arm/mach-omap2/board-rx51-peripherals.c	modified	+33	−38	View file
arch/arm/mach-omap2/devices.c	modified	+0	−31	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+1	−1	View file
arch/sh/boards/mach-ap325rxa/setup.c	modified	+1	−1	View file
drivers/gpu/ipu-v3/ipu-csi.c	modified	+33	−33	View file
drivers/media/common/cx2341x.c	modified	+29	−0	View file
drivers/media/common/saa7146/saa7146_core.c	modified	+1	−1	View file
drivers/media/common/siano/smsir.c	modified	+1	−2	View file
drivers/media/common/tveeprom.c	modified	+29	−7	View file
drivers/media/dvb-core/dvb-usb-ids.h	modified	+1	−0	View file
drivers/media/dvb-core/dvb_net.c	modified	+3	−1	View file
drivers/media/dvb-frontends/Kconfig	modified	+4	−1	View file
drivers/media/dvb-frontends/af9033.c	modified	+128	−12	View file
drivers/media/dvb-frontends/af9033_priv.h	modified	+10	−1	View file
drivers/media/dvb-frontends/au8522_dig.c	modified	+110	−7	View file
drivers/media/dvb-frontends/cx22700.c	modified	+3	−0	View file
drivers/media/dvb-frontends/cx24110.c	modified	+24	−26	View file
drivers/media/dvb-frontends/cx24117.c	modified	+1	−1	View file
drivers/media/dvb-frontends/dib7000p.c	modified	+4	−5	View file
drivers/media/dvb-frontends/drx39xyj/drxj.c	modified	+1	−2	View file
drivers/media/dvb-frontends/drxk_hard.c	modified	+4	−5	View file
drivers/media/dvb-frontends/m88ds3103.c	modified	+174	−93	View file
drivers/media/dvb-frontends/m88ds3103_priv.h	modified	+181	−0	View file
drivers/media/dvb-frontends/mn88472.h	added	+38	−0	View file
drivers/media/dvb-frontends/mn88473.h	added	+38	−0	View file
drivers/media/dvb-frontends/rtl2832.c	modified	+57	−3	View file
drivers/media/dvb-frontends/rtl2832.h	modified	+11	−0	View file
drivers/media/dvb-frontends/rtl2832_sdr.c	modified	+8	−0	View file
drivers/media/dvb-frontends/si2168.c	modified	+53	−22	View file
drivers/media/dvb-frontends/si2168.h	modified	+4	−0	View file
drivers/media/dvb-frontends/si2168_priv.h	modified	+1	−0	View file
drivers/media/dvb-frontends/sp2.c	modified	+12	−9	View file
drivers/media/dvb-frontends/stb0899_drv.c	modified	+1	−1	View file
drivers/media/dvb-frontends/stv090x.c	modified	+105	−91	View file
drivers/media/dvb-frontends/stv090x.h	modified	+19	−25	View file
drivers/media/firewire/firedtv-ci.c	modified	+1	−2	View file
drivers/media/firewire/firedtv.h	modified	+1	−1	View file
drivers/media/i2c/adv7170.c	modified	+8	−8	View file
drivers/media/i2c/adv7175.c	modified	+8	−8	View file
drivers/media/i2c/adv7180.c	modified	+3	−3	View file
drivers/media/i2c/adv7183.c	modified	+3	−3	View file
drivers/media/i2c/adv7511.c	modified	+222	−7	View file
drivers/media/i2c/adv7604.c	modified	+54	−55	View file
drivers/media/i2c/adv7842.c	modified	+23	−17	View file
drivers/media/i2c/ak881x.c	modified	+4	−4	View file
drivers/media/i2c/cx25840/cx25840-core.c	modified	+7	−7	View file
drivers/media/i2c/cx25840/cx25840-firmware.c	modified	+5	−6	View file
drivers/media/i2c/ir-kbd-i2c.c	modified	+1	−2	View file
drivers/media/i2c/m5mols/m5mols_core.c	modified	+3	−3	View file
drivers/media/i2c/ml86v7667.c	modified	+3	−3	View file
drivers/media/i2c/mt9m032.c	modified	+3	−3	View file
drivers/media/i2c/mt9p031.c	modified	+4	−4	View file
drivers/media/i2c/mt9t001.c	modified	+4	−4	View file
drivers/media/i2c/mt9v011.c	modified	+3	−3	View file
drivers/media/i2c/mt9v032.c	modified	+6	−6	View file
drivers/media/i2c/noon010pc30.c	modified	+6	−6	View file
drivers/media/i2c/ov7670.c	modified	+8	−8	View file
drivers/media/i2c/ov9650.c	modified	+5	−5	View file
drivers/media/i2c/s5c73m3/s5c73m3.h	modified	+3	−3	View file
drivers/media/i2c/s5k4ecgx.c	modified	+2	−2	View file
drivers/media/i2c/s5k5baf.c	modified	+7	−7	View file
drivers/media/i2c/s5k6a3.c	modified	+1	−1	View file
drivers/media/i2c/s5k6aa.c	modified	+4	−4	View file
drivers/media/i2c/saa6752hs.c	modified	+3	−3	View file
drivers/media/i2c/saa7115.c	modified	+1	−1	View file
drivers/media/i2c/saa717x.c	modified	+1	−1	View file
drivers/media/i2c/smiapp-pll.c	modified	+157	−123	View file
drivers/media/i2c/smiapp-pll.h	modified	+11	−10	View file
drivers/media/i2c/smiapp/smiapp-core.c	modified	+168	−91	View file
drivers/media/i2c/smiapp/smiapp.h	modified	+8	−0	View file
drivers/media/i2c/soc_camera/imx074.c	modified	+4	−4	View file
drivers/media/i2c/soc_camera/mt9m001.c	modified	+7	−7	View file
drivers/media/i2c/soc_camera/mt9m111.c	modified	+35	−35	View file
drivers/media/i2c/soc_camera/mt9t031.c	modified	+5	−5	View file
drivers/media/i2c/soc_camera/mt9t112.c	modified	+11	−11	View file
drivers/media/i2c/soc_camera/mt9v022.c	modified	+13	−13	View file
drivers/media/i2c/soc_camera/ov2640.c	modified	+27	−27	View file
drivers/media/i2c/soc_camera/ov5642.c	modified	+4	−4	View file
drivers/media/i2c/soc_camera/ov6650.c	modified	+29	−29	View file
drivers/media/i2c/soc_camera/ov772x.c	modified	+10	−10	View file
drivers/media/i2c/soc_camera/ov9640.c	modified	+20	−20	View file
drivers/media/i2c/soc_camera/ov9740.c	modified	+6	−6	View file
drivers/media/i2c/soc_camera/rj54n1cb0c.c	modified	+27	−27	View file
drivers/media/i2c/soc_camera/tw9910.c	modified	+5	−5	View file
drivers/media/i2c/sr030pc30.c	modified	+7	−7	View file
drivers/media/i2c/tvp514x.c	modified	+6	−6	View file
drivers/media/i2c/tvp5150.c	modified	+3	−3	View file
drivers/media/i2c/tvp7002.c	modified	+5	−5	View file
drivers/media/i2c/vs6624.c	modified	+9	−9	View file
drivers/media/media-entity.c	modified	+12	−1	View file
drivers/media/pci/Kconfig	modified	+1	−0	View file
drivers/media/pci/Makefile	modified	+2	−1	View file
drivers/media/pci/bt8xx/bttv-cards.c	modified	+3	−3	View file
drivers/media/pci/bt8xx/bttv-risc.c	modified	+6	−6	View file
drivers/media/pci/cx18/cx18-av-core.c	modified	+9	−9	View file
drivers/media/pci/cx18/cx18-cards.h	modified	+2	−1	View file
drivers/media/pci/cx18/cx18-controls.c	modified	+1	−1	View file
drivers/media/pci/cx18/cx18-driver.h	modified	+1	−0	View file
drivers/media/pci/cx18/cx18-ioctl.c	modified	+5	−4	View file
drivers/media/pci/cx18/cx18-streams.c	modified	+9	−0	View file
drivers/media/pci/cx23885/cx23885-417.c	modified	+1	−3	View file
drivers/media/pci/cx23885/cx23885-cards.c	modified	+131	−0	View file
drivers/media/pci/cx23885/cx23885-core.c	modified	+9	−6	View file
drivers/media/pci/cx23885/cx23885-dvb.c	modified	+538	−153	View file
drivers/media/pci/cx23885/cx23885-input.c	modified	+31	−0	View file
drivers/media/pci/cx23885/cx23885-vbi.c	modified	+1	−9	View file
drivers/media/pci/cx23885/cx23885-video.c	modified	+2	−10	View file
drivers/media/pci/cx23885/cx23885.h	modified	+8	−0	View file
drivers/media/pci/cx25821/cx25821-core.c	modified	+6	−6	View file
drivers/media/pci/cx88/Kconfig	modified	+2	−3	View file
drivers/media/pci/cx88/Makefile	modified	+0	−1	View file
drivers/media/pci/cx88/cx88-alsa.c	modified	+93	−19	View file
drivers/media/pci/cx88/cx88-blackbird.c	modified	+253	−312	View file
drivers/media/pci/cx88/cx88-cards.c	modified	+38	−33	View file
drivers/media/pci/cx88/cx88-core.c	modified	+40	−79	View file
drivers/media/pci/cx88/cx88-dvb.c	modified	+108	−50	View file
drivers/media/pci/cx88/cx88-mpeg.c	modified	+39	−120	View file
drivers/media/pci/cx88/cx88-vbi.c	modified	+106	−110	View file
drivers/media/pci/cx88/cx88-video.c	modified	+264	−607	View file
drivers/media/pci/cx88/cx88.h	modified	+45	−59	View file
drivers/media/pci/ddbridge/ddbridge-core.c	modified	+1	−2	View file
drivers/media/pci/ivtv/ivtv-controls.c	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-ioctl.c	modified	+1	−1	View file
drivers/media/pci/ivtv/ivtv-udma.c	modified	+1	−1	View file
drivers/media/pci/meye/meye.c	modified	+0	−3	View file
drivers/media/pci/pt1/pt1.c	modified	+5	−8	View file
drivers/media/pci/pt3/pt3.c	modified	+36	−39	View file
drivers/media/pci/saa7134/saa7134-core.c	modified	+13	−5	View file
drivers/media/pci/saa7134/saa7134-empress.c	modified	+2	−3	View file
drivers/media/pci/saa7134/saa7134-ts.c	modified	+1	−16	View file
drivers/media/pci/saa7134/saa7134-vbi.c	modified	+1	−15	View file
drivers/media/pci/saa7134/saa7134-video.c	modified	+1	−15	View file
drivers/media/pci/saa7134/saa7134.h	modified	+1	−1	View file
drivers/media/pci/saa7164/saa7164-buffer.c	modified	+2	−2	View file
drivers/media/pci/saa7164/saa7164-bus.c	modified	+59	−42	View file
drivers/media/pci/saa7164/saa7164-core.c	modified	+6	−7	View file
drivers/media/pci/saa7164/saa7164-fw.c	modified	+3	−3	View file
drivers/media/pci/saa7164/saa7164-types.h	modified	+2	−2	View file
drivers/media/pci/saa7164/saa7164.h	modified	+2	−2	View file
drivers/media/pci/smipcie/Kconfig	added	+17	−0	View file
drivers/media/pci/smipcie/Makefile	added	+6	−0	View file
drivers/media/pci/smipcie/smipcie.c	added	+1099	−0	View file
drivers/media/pci/smipcie/smipcie.h	added	+299	−0	View file
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c	modified	+50	−38	View file
drivers/media/pci/solo6x10/solo6x10.h	modified	+1	−0	View file
drivers/media/pci/tw68/tw68-core.c	modified	+12	−3	View file
drivers/media/pci/tw68/tw68-video.c	modified	+1	−8	View file
drivers/media/pci/tw68/tw68.h	modified	+1	−0	View file
drivers/media/pci/zoran/zoran_driver.c	modified	+3	−2	View file
drivers/media/platform/Kconfig	modified	+2	−2	View file
drivers/media/platform/Makefile	modified	+1	−1	View file
drivers/media/platform/blackfin/bfin_capture.c	modified	+12	−22	View file
drivers/media/platform/coda/Makefile	modified	+1	−1	View file
drivers/media/platform/coda/coda-bit.c	modified	+199	−123	View file
drivers/media/platform/coda/coda-common.c	modified	+397	−210	View file
drivers/media/platform/coda/coda-jpeg.c	added	+238	−0	View file
drivers/media/platform/coda/coda.h	modified	+20	−4	View file
drivers/media/platform/coda/coda_regs.h	modified	+7	−0	View file
drivers/media/platform/davinci/vpbe.c	modified	+17	−4	View file
drivers/media/platform/davinci/vpbe_display.c	modified	+150	−467	View file
drivers/media/platform/davinci/vpfe_capture.c	modified	+4	−4	View file
drivers/media/platform/davinci/vpif_capture.c	modified	+2	−0	View file
drivers/media/platform/exynos-gsc/gsc-core.c	modified	+13	−10	View file
drivers/media/platform/exynos-gsc/gsc-core.h	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-capture.c	modified	+1	−1	View file
drivers/media/platform/exynos4-is/fimc-core.c	modified	+7	−7	View file
drivers/media/platform/exynos4-is/fimc-core.h	modified	+2	−2	View file
drivers/media/platform/exynos4-is/fimc-is.c	modified	+4	−6	View file
drivers/media/platform/exynos4-is/fimc-isp.c	modified	+8	−8	View file
drivers/media/platform/exynos4-is/fimc-lite-reg.c	modified	+13	−13	View file
drivers/media/platform/exynos4-is/fimc-lite.c	modified	+7	−7	View file
drivers/media/platform/exynos4-is/fimc-reg.c	modified	+7	−7	View file
drivers/media/platform/exynos4-is/mipi-csis.c	modified	+7	−7	View file
drivers/media/platform/fsl-viu.c	modified	+2	−1	View file
drivers/media/platform/marvell-ccic/mcam-core.c	modified	+30	−55	View file
drivers/media/platform/marvell-ccic/mcam-core.h	modified	+2	−1	View file
drivers/media/platform/mx2_emmaprp.c	modified	+2	−7	View file
drivers/media/platform/omap/Kconfig	modified	+2	−1	View file
drivers/media/platform/omap/omap_vout.c	modified	+6	−5	View file
drivers/media/platform/omap3isp/ispccdc.c	modified	+55	−57	View file
drivers/media/platform/omap3isp/ispccp2.c	modified	+9	−9	View file
drivers/media/platform/omap3isp/ispcsi2.c	modified	+21	−21	View file
drivers/media/platform/omap3isp/isppreview.c	modified	+29	−31	View file
drivers/media/platform/omap3isp/ispresizer.c	modified	+9	−10	View file
drivers/media/platform/omap3isp/ispvideo.c	modified	+47	−48	View file
drivers/media/platform/omap3isp/ispvideo.h	modified	+5	−5	View file
drivers/media/platform/s3c-camif/camif-capture.c	modified	+5	−5	View file
drivers/media/platform/s3c-camif/camif-core.c	modified	+1	−2	View file
drivers/media/platform/s3c-camif/camif-regs.c	modified	+4	−4	View file
drivers/media/platform/s5p-g2d/g2d.c	modified	+2	−8	View file
drivers/media/platform/s5p-jpeg/jpeg-core.c	modified	+2	−7	View file
drivers/media/platform/s5p-mfc/regs-mfc-v6.h	modified	+1	−0	View file
drivers/media/platform/s5p-mfc/s5p_mfc.c	modified	+30	−19	View file
drivers/media/platform/s5p-mfc/s5p_mfc_common.h	modified	+1	−3	View file
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c	modified	+96	−26	View file
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	modified	+4	−8	View file
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	modified	+58	−7	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c	modified	+2	−11	View file
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c	modified	+4	−28	View file
drivers/media/platform/s5p-tv/hdmi_drv.c	modified	+1	−1	View file
drivers/media/platform/s5p-tv/sdo_drv.c	modified	+1	−1	View file
drivers/media/platform/sh_vou.c	modified	+6	−5	View file
drivers/media/platform/soc_camera/atmel-isi.c	modified	+11	−11	View file
drivers/media/platform/soc_camera/mx2_camera.c	modified	+12	−14	View file
drivers/media/platform/soc_camera/mx3_camera.c	modified	+3	−3	View file
drivers/media/platform/soc_camera/omap1_camera.c	modified	+18	−18	View file
drivers/media/platform/soc_camera/pxa_camera.c	modified	+8	−8	View file
drivers/media/platform/soc_camera/rcar_vin.c	modified	+7	−7	View file
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c	modified	+10	−10	View file
drivers/media/platform/soc_camera/sh_mobile_csi2.c	modified	+19	−19	View file
drivers/media/platform/soc_camera/soc_camera.c	modified	+1	−1	View file
drivers/media/platform/soc_camera/soc_camera_platform.c	modified	+1	−1	View file
drivers/media/platform/soc_camera/soc_mediabus.c	modified	+39	−39	View file
drivers/media/platform/ti-vpe/csc.c	modified	+3	−7	View file
drivers/media/platform/ti-vpe/sc.c	modified	+3	−7	View file
drivers/media/platform/via-camera.c	modified	+6	−6	View file
drivers/media/platform/mem2mem_testdev.c → drivers/media/platform/vim2m.c	renamed	+111	−111	View file
drivers/media/platform/vino.c	modified	+2	−4	View file
drivers/media/platform/vivid/vivid-core.c	modified	+6	−15	View file
drivers/media/platform/vivid/vivid-core.h	modified	+13	−3	View file
drivers/media/platform/vivid/vivid-ctrls.c	modified	+137	−28	View file
drivers/media/platform/vivid/vivid-sdr-cap.c	modified	+2	−2	View file
drivers/media/platform/vivid/vivid-tpg-colors.c	modified	+662	−42	View file
drivers/media/platform/vivid/vivid-tpg-colors.h	modified	+3	−1	View file
drivers/media/platform/vivid/vivid-tpg.c	modified	+220	−107	View file
drivers/media/platform/vivid/vivid-tpg.h	modified	+38	−0	View file
drivers/media/platform/vivid/vivid-vbi-cap.c	modified	+2	−2	View file
drivers/media/platform/vivid/vivid-vbi-out.c	modified	+2	−2	View file
drivers/media/platform/vivid/vivid-vid-cap.c	modified	+28	−10	View file
drivers/media/platform/vivid/vivid-vid-common.c	modified	+4	−0	View file
drivers/media/platform/vivid/vivid-vid-out.c	modified	+21	−8	View file
drivers/media/platform/vsp1/vsp1_bru.c	modified	+7	−7	View file
drivers/media/platform/vsp1/vsp1_hsit.c	modified	+6	−6	View file
drivers/media/platform/vsp1/vsp1_lif.c	modified	+5	−5	View file
drivers/media/platform/vsp1/vsp1_lut.c	modified	+7	−7	View file
drivers/media/platform/vsp1/vsp1_rwpf.c	modified	+5	−5	View file
drivers/media/platform/vsp1/vsp1_sru.c	modified	+6	−6	View file
drivers/media/platform/vsp1/vsp1_uds.c	modified	+5	−5	View file
drivers/media/platform/vsp1/vsp1_video.c	modified	+21	−21	View file
drivers/media/radio/radio-wl1273.c	modified	+3	−1	View file
drivers/media/radio/si4713/radio-platform-si4713.c	modified	+6	−22	View file
drivers/media/radio/si4713/si4713.c	modified	+105	−59	View file
drivers/media/radio/si4713/si4713.h	modified	+10	−5	View file
drivers/media/radio/wl128x/fmdrv_v4l2.c	modified	+3	−1	View file
drivers/media/rc/Kconfig	modified	+26	−0	View file
drivers/media/rc/Makefile	modified	+2	−0	View file
drivers/media/rc/igorplugusb.c	added	+261	−0	View file
drivers/media/rc/img-ir/Kconfig	modified	+1	−0	View file
drivers/media/rc/img-ir/img-ir-core.c	modified	+0	−1	View file
drivers/media/rc/img-ir/img-ir-hw.c	modified	+23	−5	View file
drivers/media/rc/img-ir/img-ir-hw.h	modified	+3	−3	View file
drivers/media/rc/ir-lirc-codec.c	modified	+9	−3	View file
drivers/media/rc/lirc_dev.c	modified	+1	−2	View file
drivers/media/rc/meson-ir.c	added	+216	−0	View file
drivers/media/rc/rc-main.c	modified	+5	−3	View file
drivers/media/rc/redrat3.c	modified	+3	−1	View file
drivers/media/tuners/Kconfig	modified	+8	−0	View file
drivers/media/tuners/Makefile	modified	+1	−0	View file
drivers/media/tuners/m88rs6000t.c	added	+744	−0	View file
drivers/media/tuners/m88rs6000t.h	added	+29	−0	View file
drivers/media/tuners/m88ts2022.c	modified	+2	−0	View file
drivers/media/tuners/mxl5007t.c	modified	+25	−5	View file
drivers/media/tuners/r820t.c	modified	+12	−0	View file
drivers/media/tuners/si2157.c	modified	+31	−13	View file
drivers/media/tuners/si2157.h	modified	+1	−1	View file
drivers/media/tuners/si2157_priv.h	modified	+6	−2	View file
drivers/media/tuners/tda18271-common.c	modified	+1	−1	View file
drivers/media/tuners/xc5000.c	modified	+14	−3	View file
drivers/media/tuners/xc5000.h	modified	+1	−0	View file
drivers/media/usb/au0828/au0828-cards.c	modified	+5	−0	View file
drivers/media/usb/au0828/au0828-core.c	modified	+8	−0	View file
drivers/media/usb/au0828/au0828-dvb.c	modified	+2	−0	View file
drivers/media/usb/au0828/au0828-input.c	modified	+10	−4	View file
drivers/media/usb/cx231xx/Kconfig	modified	+1	−0	View file
drivers/media/usb/cx231xx/cx231xx-417.c	modified	+34	−25	View file
drivers/media/usb/cx231xx/cx231xx-audio.c	modified	+48	−49	View file
drivers/media/usb/cx231xx/cx231xx-avcore.c	modified	+178	−153	View file
drivers/media/usb/cx231xx/cx231xx-cards.c	modified	+129	−128	View file
drivers/media/usb/cx231xx/cx231xx-core.c	modified	+87	−78	View file
drivers/media/usb/cx231xx/cx231xx-dvb.c	modified	+81	−78	View file
drivers/media/usb/cx231xx/cx231xx-i2c.c	modified	+102	−30	View file
drivers/media/usb/cx231xx/cx231xx-input.c	modified	+4	−4	View file
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c	modified	+29	−18	View file
drivers/media/usb/cx231xx/cx231xx-vbi.c	modified	+26	−22	View file
drivers/media/usb/cx231xx/cx231xx-video.c	modified	+44	−45	View file
drivers/media/usb/cx231xx/cx231xx.h	modified	+16	−25	View file
drivers/media/usb/dvb-usb-v2/Kconfig	modified	+3	−0	View file
drivers/media/usb/dvb-usb-v2/af9035.c	modified	+1	−0	View file
drivers/media/usb/dvb-usb-v2/dvbsky.c	modified	+423	−15	View file
drivers/media/usb/dvb-usb-v2/lmedm04.c	modified	+14	−8	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.c	modified	+167	−64	View file
drivers/media/usb/dvb-usb-v2/rtl28xxu.h	modified	+6	−1	View file
drivers/media/usb/dvb-usb/Kconfig	modified	+0	−1	View file
drivers/media/usb/dvb-usb/af9005.c	modified	+3	−0	View file
drivers/media/usb/dvb-usb/cxusb.c	modified	+33	−197	View file
drivers/media/usb/dvb-usb/cxusb.h	modified	+0	−4	View file
drivers/media/usb/dvb-usb/technisat-usb2.c	modified	+4	−1	View file
drivers/media/usb/em28xx/em28xx-audio.c	modified	+9	−10	View file
drivers/media/usb/em28xx/em28xx-camera.c	modified	+1	−6	View file
drivers/media/usb/em28xx/em28xx-cards.c	modified	+57	−14	View file
drivers/media/usb/em28xx/em28xx-core.c	modified	+22	−19	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+76	−19	View file
drivers/media/usb/em28xx/em28xx-i2c.c	modified	+4	−2	View file
drivers/media/usb/em28xx/em28xx-input.c	modified	+8	−9	View file
drivers/media/usb/em28xx/em28xx-reg.h	modified	+0	−3	View file
drivers/media/usb/em28xx/em28xx-v4l.h	modified	+0	−1	View file
drivers/media/usb/em28xx/em28xx-vbi.c	modified	+0	−1	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+52	−46	View file
drivers/media/usb/em28xx/em28xx.h	modified	+14	−13	View file
drivers/media/usb/go7007/go7007-v4l2.c	modified	+1	−1	View file
drivers/media/usb/pvrusb2/pvrusb2-context.c	modified	+1	−1	View file
drivers/media/usb/pvrusb2/pvrusb2-hdw.c	modified	+1	−1	View file
drivers/media/usb/s2255/s2255drv.c	modified	+11	−14	View file
drivers/media/usb/stk1160/stk1160-v4l.c	modified	+1	−1	View file
drivers/media/usb/usbvision/usbvision-video.c	modified	+2	−1	View file
drivers/media/usb/uvc/uvc_driver.c	modified	+43	−8	View file
drivers/media/usb/uvc/uvc_queue.c	modified	+97	−64	View file
drivers/media/usb/uvc/uvc_v4l2.c	modified	+552	−457	View file
drivers/media/usb/uvc/uvc_video.c	modified	+3	−20	View file
drivers/media/usb/uvc/uvcvideo.h	modified	+8	−4	View file
drivers/media/v4l2-core/v4l2-common.c	modified	+0	−125	View file
drivers/media/v4l2-core/v4l2-compat-ioctl32.c	modified	+6	−4	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+52	−35	View file
drivers/media/v4l2-core/v4l2-dev.c	modified	+14	−20	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+9	−6	View file
drivers/media/v4l2-core/videobuf-core.c	modified	+4	−2	View file
drivers/media/v4l2-core/videobuf2-core.c	modified	+21	−28	View file
drivers/media/v4l2-core/videobuf2-dma-contig.c	modified	+46	−25	View file
drivers/media/v4l2-core/videobuf2-dma-sg.c	modified	+407	−18	View file
drivers/media/v4l2-core/videobuf2-vmalloc.c	modified	+184	−10	View file
drivers/staging/media/Kconfig	modified	+3	−1	View file
drivers/staging/media/Makefile	modified	+2	−2	View file
drivers/staging/media/bcm2048/radio-bcm2048.c	modified	+4	−3	View file
drivers/staging/media/davinci_vpfe/dm365_ipipe.c	modified	+9	−9	View file
drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c	modified	+13	−13	View file
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c	modified	+50	−50	View file
drivers/staging/media/davinci_vpfe/dm365_isif.c	modified	+45	−45	View file
drivers/staging/media/davinci_vpfe/dm365_resizer.c	modified	+49	−49	View file
drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c	modified	+9	−9	View file
drivers/staging/media/davinci_vpfe/vpfe_video.c	modified	+4	−4	View file
drivers/staging/media/dt3155v4l/dt3155v4l.c	modified	+2	−3	View file
drivers/staging/media/lirc/Kconfig	modified	+0	−6	View file
drivers/staging/media/lirc/Makefile	modified	+0	−1	View file
drivers/staging/media/lirc/lirc_igorplugusb.c	deleted	+0	−508	View before deletion
drivers/staging/media/lirc/lirc_imon.c	modified	+2	−8	View file
drivers/staging/media/lirc/lirc_sasem.c	modified	+2	−8	View file
drivers/staging/media/lirc/lirc_zilog.c	modified	+3	−5	View file
drivers/staging/media/mn88472/Kconfig	added	+7	−0	View file
drivers/staging/media/mn88472/Makefile	added	+5	−0	View file
drivers/staging/media/mn88472/TODO	added	+21	−0	View file
drivers/staging/media/mn88472/mn88472.c	added	+523	−0	View file
drivers/staging/media/mn88472/mn88472_priv.h	added	+36	−0	View file
drivers/staging/media/mn88473/Kconfig	added	+7	−0	View file
drivers/staging/media/mn88473/Makefile	added	+5	−0	View file
drivers/staging/media/mn88473/TODO	added	+21	−0	View file
drivers/staging/media/mn88473/mn88473.c	added	+464	−0	View file
drivers/staging/media/mn88473/mn88473_priv.h	added	+36	−0	View file
drivers/staging/media/omap24xx/Kconfig	deleted	+0	−35	View before deletion
drivers/staging/media/omap24xx/Makefile	deleted	+0	−5	View before deletion
drivers/staging/media/omap24xx/omap24xxcam-dma.c	deleted	+0	−598	View before deletion
drivers/staging/media/omap24xx/omap24xxcam.c	deleted	+0	−1882	View before deletion
drivers/staging/media/omap24xx/omap24xxcam.h	deleted	+0	−596	View before deletion
drivers/staging/media/omap24xx/tcm825x.c	deleted	+0	−938	View before deletion
drivers/staging/media/omap24xx/tcm825x.h	deleted	+0	−200	View before deletion
drivers/staging/media/omap24xx/v4l2-int-device.c	deleted	+0	−164	View before deletion
drivers/staging/media/omap24xx/v4l2-int-device.h	deleted	+0	−305	View before deletion
drivers/staging/media/omap4iss/iss_csi2.c	modified	+31	−31	View file
drivers/staging/media/omap4iss/iss_ipipe.c	modified	+8	−8	View file
drivers/staging/media/omap4iss/iss_ipipeif.c	modified	+14	−14	View file
drivers/staging/media/omap4iss/iss_resizer.c	modified	+13	−13	View file
drivers/staging/media/omap4iss/iss_video.c	modified	+39	−39	View file
drivers/staging/media/omap4iss/iss_video.h	modified	+5	−5	View file
include/media/davinci/vpbe.h	modified	+1	−1	View file
include/media/davinci/vpbe_display.h	modified	+0	−21	View file
include/media/davinci/vpbe_venc.h	modified	+2	−3	View file
include/media/exynos-fimc.h	modified	+1	−1	View file
include/media/lirc_dev.h	modified	+2	−6	View file
include/media/radio-si4713.h	deleted	+0	−30	View before deletion
include/media/si4713.h	modified	+1	−3	View file
include/media/soc_camera.h	modified	+1	−1	View file
include/media/soc_mediabus.h	modified	+3	−3	View file
include/media/v4l2-common.h	modified	+1	−16	View file
include/media/v4l2-ctrls.h	modified	+25	−0	View file
include/media/v4l2-image-sizes.h	modified	+9	−0	View file
include/media/v4l2-mediabus.h	modified	+5	−1	View file
include/media/v4l2-subdev.h	modified	+1	−1	View file
include/media/videobuf2-core.h	modified	+24	−18	View file
include/media/videobuf2-dma-sg.h	modified	+3	−0	View file
include/uapi/linux/Kbuild	modified	+1	−0	View file
include/uapi/linux/media-bus-format.h	added	+125	−0	View file
include/uapi/linux/v4l2-common.h	modified	+2	−0	View file
include/uapi/linux/v4l2-mediabus.h	modified	+105	−114	View file
include/uapi/linux/v4l2-subdev.h	modified	+3	−3	View file
include/uapi/linux/videodev2.h	modified	+91	−10	View file
sound/usb/quirks-table.h	modified	+39	−127	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 948ddaa..3018564 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -120,8 +120,8 @@ struct dtv_properties {
 </para>
 <informaltable><tgroup cols="1"><tbody><row><entry
  align="char">
-<para>This ioctl call sets one or more frontend properties. This call only
- requires read-only access to the device.</para>
+<para>This ioctl call sets one or more frontend properties. This call
+ requires read/write access to the device.</para>
 </entry>
  </row></tbody></tgroup></informaltable>
 <para>SYNOPSIS

Documentation/DocBook/media/v4l/biblio.xml

View file

diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml
index d2eb79e..7ff01a2 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -178,6 +178,75 @@ Signal - NTSC for Studio Applications"</title>
 1125-Line High-Definition Production"</title>
     </biblioentry>
 
+    <biblioentry id="srgb">
+      <abbrev>sRGB</abbrev>
+      <authorgroup>
+	<corpauthor>International Electrotechnical Commission
+(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>IEC 61966-2-1 ed1.0 "Multimedia systems and equipment - Colour measurement
+and management - Part 2-1: Colour management - Default RGB colour space - sRGB"</title>
+    </biblioentry>
+
+    <biblioentry id="sycc">
+      <abbrev>sYCC</abbrev>
+      <authorgroup>
+	<corpauthor>International Electrotechnical Commission
+(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>IEC 61966-2-1-am1 ed1.0 "Amendment 1 - Multimedia systems and equipment - Colour measurement
+and management - Part 2-1: Colour management - Default RGB colour space - sRGB"</title>
+    </biblioentry>
+
+    <biblioentry id="xvycc">
+      <abbrev>xvYCC</abbrev>
+      <authorgroup>
+	<corpauthor>International Electrotechnical Commission
+(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>IEC 61966-2-4 ed1.0 "Multimedia systems and equipment - Colour measurement
+and management - Part 2-4: Colour management - Extended-gamut YCC colour space for video
+applications - xvYCC"</title>
+    </biblioentry>
+
+    <biblioentry id="adobergb">
+      <abbrev>AdobeRGB</abbrev>
+      <authorgroup>
+	<corpauthor>Adobe Systems Incorporated (<ulink url="http://www.adobe.com">http://www.adobe.com</ulink>)</corpauthor>
+      </authorgroup>
+      <title>Adobe&copy; RGB (1998) Color Image Encoding Version 2005-05</title>
+    </biblioentry>
+
+    <biblioentry id="oprgb">
+      <abbrev>opRGB</abbrev>
+      <authorgroup>
+	<corpauthor>International Electrotechnical Commission
+(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>IEC 61966-2-5 "Multimedia systems and equipment - Colour measurement
+and management - Part 2-5: Colour management - Optional RGB colour space - opRGB"</title>
+    </biblioentry>
+
+    <biblioentry id="itu2020">
+      <abbrev>ITU&nbsp;BT.2020</abbrev>
+      <authorgroup>
+	<corpauthor>International Telecommunication Union (<ulink
+url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-R Recommendation BT.2020 (08/2012) "Parameter values for ultra-high
+definition television systems for production and international programme exchange"
+</title>
+    </biblioentry>
+
+    <biblioentry id="tech3213">
+      <abbrev>EBU&nbsp;Tech&nbsp;3213</abbrev>
+      <authorgroup>
+	<corpauthor>European Broadcast Union (<ulink
+url="http://www.ebu.ch">http://www.ebu.ch</ulink>)</corpauthor>
+      </authorgroup>
+      <title>E.B.U. Standard for Chromaticity Tolerances for Studio Monitors"</title>
+    </biblioentry>
+
     <biblioentry id="iec62106">
       <abbrev>IEC&nbsp;62106</abbrev>
       <authorgroup>
@@ -266,4 +335,20 @@ in the frequency range from 87,5 to 108,0 MHz</title>
       <subtitle>Version 1, Revision 2</subtitle>
     </biblioentry>
 
+    <biblioentry id="poynton">
+      <abbrev>poynton</abbrev>
+      <authorgroup>
+	<corpauthor>Charles Poynton</corpauthor>
+      </authorgroup>
+      <title>Digital Video and HDTV, Algorithms and Interfaces</title>
+    </biblioentry>
+
+    <biblioentry id="colimg">
+      <abbrev>colimg</abbrev>
+      <authorgroup>
+	<corpauthor>Erik Reinhard et al.</corpauthor>
+      </authorgroup>
+      <title>Color Imaging: Fundamentals and Applications</title>
+    </biblioentry>
+
   </bibliography>

Documentation/DocBook/media/v4l/dev-subdev.xml

View file

diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml b/Documentation/DocBook/media/v4l/dev-subdev.xml
index d15aaf8..4f0ba58 100644
--- a/Documentation/DocBook/media/v4l/dev-subdev.xml
+++ b/Documentation/DocBook/media/v4l/dev-subdev.xml
@@ -195,53 +195,59 @@
 	<title>Sample Pipeline Configuration</title>
 	<tgroup cols="3">
 	  <colspec colname="what"/>
-	  <colspec colname="sensor-0" />
-	  <colspec colname="frontend-0" />
-	  <colspec colname="frontend-1" />
-	  <colspec colname="scaler-0" />
-	  <colspec colname="scaler-1" />
+	  <colspec colname="sensor-0 format" />
+	  <colspec colname="frontend-0 format" />
+	  <colspec colname="frontend-1 format" />
+	  <colspec colname="scaler-0 format" />
+	  <colspec colname="scaler-0 compose" />
+	  <colspec colname="scaler-1 format" />
 	  <thead>
 	    <row>
 	      <entry></entry>
-	      <entry>Sensor/0</entry>
-	      <entry>Frontend/0</entry>
-	      <entry>Frontend/1</entry>
-	      <entry>Scaler/0</entry>
-	      <entry>Scaler/1</entry>
+	      <entry>Sensor/0 format</entry>
+	      <entry>Frontend/0 format</entry>
+	      <entry>Frontend/1 format</entry>
+	      <entry>Scaler/0 format</entry>
+	      <entry>Scaler/0 compose selection rectangle</entry>
+	      <entry>Scaler/1 format</entry>
 	    </row>
 	  </thead>
 	  <tbody valign="top">
 	    <row>
 	      <entry>Initial state</entry>
-	      <entry>2048x1536</entry>
-	      <entry>-</entry>
-	      <entry>-</entry>
-	      <entry>-</entry>
-	      <entry>-</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
 	    </row>
 	    <row>
-	      <entry>Configure frontend input</entry>
-	      <entry>2048x1536</entry>
-	      <entry><emphasis>2048x1536</emphasis></entry>
-	      <entry><emphasis>2046x1534</emphasis></entry>
-	      <entry>-</entry>
-	      <entry>-</entry>
+	      <entry>Configure frontend sink format</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry><emphasis>2048x1536/SGRBG8_1X8</emphasis></entry>
+	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
+	      <entry>(default)</entry>
 	    </row>
 	    <row>
-	      <entry>Configure scaler input</entry>
-	      <entry>2048x1536</entry>
-	      <entry>2048x1536</entry>
-	      <entry>2046x1534</entry>
-	      <entry><emphasis>2046x1534</emphasis></entry>
-	      <entry><emphasis>2046x1534</emphasis></entry>
+	      <entry>Configure scaler sink format</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry>2046x1534/SGRBG8_1X8</entry>
+	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>
+	      <entry><emphasis>0,0/2046x1534</emphasis></entry>
+	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>
 	    </row>
 	    <row>
-	      <entry>Configure scaler output</entry>
-	      <entry>2048x1536</entry>
-	      <entry>2048x1536</entry>
-	      <entry>2046x1534</entry>
-	      <entry>2046x1534</entry>
-	      <entry><emphasis>1280x960</emphasis></entry>
+	      <entry>Configure scaler sink compose selection</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry>2048x1536/SGRBG8_1X8</entry>
+	      <entry>2046x1534/SGRBG8_1X8</entry>
+	      <entry>2046x1534/SGRBG8_1X8</entry>
+	      <entry><emphasis>0,0/1280x960</emphasis></entry>
+	      <entry><emphasis>1280x960/SGRBG8_1X8</emphasis></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -249,19 +255,30 @@
 
       <para>
       <orderedlist>
-	<listitem><para>Initial state. The sensor output is set to its native 3MP
-	resolution. Resolutions on the host frontend and scaler input and output
-	pads are undefined.</para></listitem>
-	<listitem><para>The application configures the frontend input pad resolution to
-	2048x1536. The driver propagates the format to the frontend output pad.
-	Note that the propagated output format can be different, as in this case,
-	than the input format, as the hardware might need to crop pixels (for
-	instance when converting a Bayer filter pattern to RGB or YUV).</para></listitem>
-	<listitem><para>The application configures the scaler input pad resolution to
-	2046x1534 to match the frontend output resolution. The driver propagates
-	the format to the scaler output pad.</para></listitem>
-	<listitem><para>The application configures the scaler output pad resolution to
-	1280x960.</para></listitem>
+	<listitem><para>Initial state. The sensor source pad format is
+	set to its native 3MP size and V4L2_MBUS_FMT_SGRBG8_1X8
+	media bus code. Formats on the host frontend and scaler sink
+	and source pads have the default values, as well as the
+	compose rectangle on the scaler's sink pad.</para></listitem>
+
+	<listitem><para>The application configures the frontend sink
+	pad format's size to 2048x1536 and its media bus code to
+	V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the format to
+	the frontend source pad.</para></listitem>
+
+	<listitem><para>The application configures the scaler sink pad
+	format's size to 2046x1534 and the media bus code to
+	V4L2_MBUS_FMT_SGRBG_1X8 to match the frontend source size and
+	media bus code. The media bus code on the sink pad is set to
+	V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the size to the
+	compose selection rectangle on the scaler's sink pad, and the
+	format to the scaler source pad.</para></listitem>
+
+	<listitem><para>The application configures the size of the compose
+	selection rectangle of the scaler's sink pad 1280x960. The driver
+	propagates the size to the scaler's source pad
+	format.</para></listitem>
+
       </orderedlist>
       </para>
 

Documentation/DocBook/media/v4l/io.xml

View file

diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml
index e5e8325..1c17f80 100644
--- a/Documentation/DocBook/media/v4l/io.xml
+++ b/Documentation/DocBook/media/v4l/io.xml
@@ -1422,7 +1422,10 @@ one of the <constant>V4L2_FIELD_NONE</constant>,
 <constant>V4L2_FIELD_BOTTOM</constant>, or
 <constant>V4L2_FIELD_INTERLACED</constant> formats is acceptable.
 Drivers choose depending on hardware capabilities or e.&nbsp;g. the
-requested image size, and return the actual field order. &v4l2-buffer;
+requested image size, and return the actual field order. Drivers must
+never return <constant>V4L2_FIELD_ANY</constant>. If multiple
+field orders are possible the driver must choose one of the possible
+field orders during &VIDIOC-S-FMT; or &VIDIOC-TRY-FMT;. &v4l2-buffer;
 <structfield>field</structfield> can never be
 <constant>V4L2_FIELD_ANY</constant>.</entry>
 	  </row>

Documentation/DocBook/media/v4l/pixfmt.xml

View file

diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index df5b23d..ccf6053 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -296,343 +296,1003 @@ in the 2-planar version or with each component in its own buffer in the
   <section id="colorspaces">
     <title>Colorspaces</title>
 
-    <para>[intro]</para>
+    <para>'Color' is a very complex concept and depends on physics, chemistry and
+biology. Just because you have three numbers that describe the 'red', 'green'
+and 'blue' components of the color of a pixel does not mean that you can accurately
+display that color. A colorspace defines what it actually <emphasis>means</emphasis>
+to have an RGB value of e.g. (255,&nbsp;0,&nbsp;0). That is, which color should be
+reproduced on the screen in a perfectly calibrated environment.</para>
 
-    <!-- See proposal by Billy Biggs, [email protected]
-on 11 Oct 2002, subject: "Re: [V4L] Re: v4l2 api", and
-http://vektor.theorem.ca/graphics/ycbcr/ and
-http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html -->
+    <para>In order to do that we first need to have a good definition of
+color, i.e. some way to uniquely and unambiguously define a color so that someone
+else can reproduce it. Human color vision is trichromatic since the human eye has
+color receptors that are sensitive to three different wavelengths of light. Hence
+the need to use three numbers to describe color. Be glad you are not a mantis shrimp
+as those are sensitive to 12 different wavelengths, so instead of RGB we would be
+using the ABCDEFGHIJKL colorspace...</para>
 
-    <para>
-      <variablelist>
-	<varlistentry>
-	  <term>Gamma Correction</term>
-	  <listitem>
-	    <para>[to do]</para>
-	    <para>E'<subscript>R</subscript> = f(R)</para>
-	    <para>E'<subscript>G</subscript> = f(G)</para>
-	    <para>E'<subscript>B</subscript> = f(B)</para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Construction of luminance and color-difference
-signals</term>
-	  <listitem>
-	    <para>[to do]</para>
-	    <para>E'<subscript>Y</subscript> =
-Coeff<subscript>R</subscript> E'<subscript>R</subscript>
-+ Coeff<subscript>G</subscript> E'<subscript>G</subscript>
-+ Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
-	    <para>(E'<subscript>R</subscript> - E'<subscript>Y</subscript>) = E'<subscript>R</subscript>
-- Coeff<subscript>R</subscript> E'<subscript>R</subscript>
-- Coeff<subscript>G</subscript> E'<subscript>G</subscript>
-- Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
-	    <para>(E'<subscript>B</subscript> - E'<subscript>Y</subscript>) = E'<subscript>B</subscript>
-- Coeff<subscript>R</subscript> E'<subscript>R</subscript>
-- Coeff<subscript>G</subscript> E'<subscript>G</subscript>
-- Coeff<subscript>B</subscript> E'<subscript>B</subscript></para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Re-normalized color-difference signals</term>
-	  <listitem>
-	    <para>The color-difference signals are scaled back to unity
-range [-0.5;+0.5]:</para>
-	    <para>K<subscript>B</subscript> = 0.5 / (1 - Coeff<subscript>B</subscript>)</para>
-	    <para>K<subscript>R</subscript> = 0.5 / (1 - Coeff<subscript>R</subscript>)</para>
-	    <para>P<subscript>B</subscript> =
-K<subscript>B</subscript> (E'<subscript>B</subscript> - E'<subscript>Y</subscript>) =
-  0.5 (Coeff<subscript>R</subscript> / Coeff<subscript>B</subscript>) E'<subscript>R</subscript>
-+ 0.5 (Coeff<subscript>G</subscript> / Coeff<subscript>B</subscript>) E'<subscript>G</subscript>
-+ 0.5 E'<subscript>B</subscript></para>
-	    <para>P<subscript>R</subscript> =
-K<subscript>R</subscript> (E'<subscript>R</subscript> - E'<subscript>Y</subscript>) =
-  0.5 E'<subscript>R</subscript>
-+ 0.5 (Coeff<subscript>G</subscript> / Coeff<subscript>R</subscript>) E'<subscript>G</subscript>
-+ 0.5 (Coeff<subscript>B</subscript> / Coeff<subscript>R</subscript>) E'<subscript>B</subscript></para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Quantization</term>
-	  <listitem>
-	    <para>[to do]</para>
-	    <para>Y' = (Lum. Levels - 1) &middot; E'<subscript>Y</subscript> + Lum. Offset</para>
-	    <para>C<subscript>B</subscript> = (Chrom. Levels - 1)
-&middot; P<subscript>B</subscript> + Chrom. Offset</para>
-	    <para>C<subscript>R</subscript> = (Chrom. Levels - 1)
-&middot; P<subscript>R</subscript> + Chrom. Offset</para>
-	    <para>Rounding to the nearest integer and clamping to the range
-[0;255] finally yields the digital color components Y'CbCr
-stored in YUV images.</para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-
-    <example>
-      <title>ITU-R Rec. BT.601 color conversion</title>
-
-      <para>Forward Transformation</para>
-
-      <programlisting>
-int ER, EG, EB;         /* gamma corrected RGB input [0;255] */
-int Y1, Cb, Cr;         /* output [0;255] */
-
-double r, g, b;         /* temporaries */
-double y1, pb, pr;
-
-int
-clamp (double x)
-{
-	int r = x;      /* round to nearest */
-
-	if (r &lt; 0)         return 0;
-	else if (r &gt; 255)  return 255;
-	else               return r;
-}
-
-r = ER / 255.0;
-g = EG / 255.0;
-b = EB / 255.0;
-
-y1  =  0.299  * r + 0.587 * g + 0.114  * b;
-pb  = -0.169  * r - 0.331 * g + 0.5    * b;
-pr  =  0.5    * r - 0.419 * g - 0.081  * b;
-
-Y1 = clamp (219 * y1 + 16);
-Cb = clamp (224 * pb + 128);
-Cr = clamp (224 * pr + 128);
-
-/* or shorter */
-
-y1 = 0.299 * ER + 0.587 * EG + 0.114 * EB;
-
-Y1 = clamp ( (219 / 255.0)                    *       y1  + 16);
-Cb = clamp (((224 / 255.0) / (2 - 2 * 0.114)) * (EB - y1) + 128);
-Cr = clamp (((224 / 255.0) / (2 - 2 * 0.299)) * (ER - y1) + 128);
-      </programlisting>
-
-      <para>Inverse Transformation</para>
-
-      <programlisting>
-int Y1, Cb, Cr;         /* gamma pre-corrected input [0;255] */
-int ER, EG, EB;         /* output [0;255] */
-
-double r, g, b;         /* temporaries */
-double y1, pb, pr;
-
-int
-clamp (double x)
-{
-	int r = x;      /* round to nearest */
-
-	if (r &lt; 0)         return 0;
-	else if (r &gt; 255)  return 255;
-	else               return r;
-}
-
-y1 = (Y1 - 16) / 219.0;
-pb = (Cb - 128) / 224.0;
-pr = (Cr - 128) / 224.0;
-
-r = 1.0 * y1 + 0     * pb + 1.402 * pr;
-g = 1.0 * y1 - 0.344 * pb - 0.714 * pr;
-b = 1.0 * y1 + 1.772 * pb + 0     * pr;
-
-ER = clamp (r * 255); /* [ok? one should prob. limit y1,pb,pr] */
-EG = clamp (g * 255);
-EB = clamp (b * 255);
-      </programlisting>
-    </example>
-
-    <table pgwide="1" id="v4l2-colorspace" orient="land">
-      <title>enum v4l2_colorspace</title>
-      <tgroup cols="11" align="center">
-	<colspec align="left" />
-	<colspec align="center" />
-	<colspec align="left" />
-	<colspec colname="cr" />
-	<colspec colname="cg" />
-	<colspec colname="cb" />
-	<colspec colname="wp" />
-	<colspec colname="gc" />
-	<colspec colname="lum" />
-	<colspec colname="qy" />
-	<colspec colname="qc" />
-	<spanspec namest="cr" nameend="cb" spanname="chrom" />
-	<spanspec namest="qy" nameend="qc" spanname="quant" />
-	<spanspec namest="lum" nameend="qc" spanname="spam" />
+    <para>Color exists only in the eye and brain and is the result of how strongly
+color receptors are stimulated. This is based on the Spectral
+Power Distribution (SPD) which is a graph showing the intensity (radiant power)
+of the light at wavelengths covering the visible spectrum as it enters the eye.
+The science of colorimetry is about the relationship between the SPD and color as
+perceived by the human brain.</para>
+
+    <para>Since the human eye has only three color receptors it is perfectly
+possible that different SPDs will result in the same stimulation of those receptors
+and are perceived as the same color, even though the SPD of the light is
+different.</para>
+
+   <para>In the 1920s experiments were devised to determine the relationship
+between SPDs and the perceived color and that resulted in the CIE 1931 standard
+that defines spectral weighting functions that model the perception of color.
+Specifically that standard defines functions that can take an SPD and calculate
+the stimulus for each color receptor. After some further mathematical transforms
+these stimuli are known as the <emphasis>CIE XYZ tristimulus</emphasis> values
+and these X, Y and Z values describe a color as perceived by a human unambiguously.
+These X, Y and Z values are all in the range [0&hellip;1].</para>
+
+   <para>The Y value in the CIE XYZ colorspace corresponds to luminance. Often
+the CIE XYZ colorspace is transformed to the normalized CIE xyY colorspace:</para>
+
+   <para>x = X / (X + Y + Z)</para>
+   <para>y = Y / (X + Y + Z)</para>
+
+   <para>The x and y values are the chromaticity coordinates and can be used to
+define a color without the luminance component Y. It is very confusing to
+have such similar names for these colorspaces. Just be aware that if colors
+are specified with lower case 'x' and 'y', then the CIE xyY colorspace is
+used. Upper case 'X' and 'Y' refer to the CIE XYZ colorspace. Also, y has nothing
+to do with luminance. Together x and y specify a color, and Y the luminance.
+That is really all you need to remember from a practical point of view. At
+the end of this section you will find reading resources that go into much more
+detail if you are interested.
+</para>
+
+   <para>A monitor or TV will reproduce colors by emitting light at three
+different wavelengths, the combination of which will stimulate the color receptors
+in the eye and thus cause the perception of color. Historically these wavelengths
+were defined by the red, green and blue phosphors used in the displays. These
+<emphasis>color primaries</emphasis> are part of what defines a colorspace.</para>
+
+    <para>Different display devices will have different primaries and some
+primaries are more suitable for some display technologies than others. This has
+resulted in a variety of colorspaces that are used for different display
+technologies or uses. To define a colorspace you need to define the three
+color primaries (these are typically defined as x,&nbsp;y chromaticity coordinates
+from the CIE xyY colorspace) but also the white reference: that is the color obtained
+when all three primaries are at maximum power. This determines the relative power
+or energy of the primaries. This is usually chosen to be close to daylight which has
+been defined as the CIE D65 Illuminant.</para>
+
+    <para>To recapitulate: the CIE XYZ colorspace uniquely identifies colors.
+Other colorspaces are defined by three chromaticity coordinates defined in the
+CIE xyY colorspace. Based on those a 3x3 matrix can be constructed that
+transforms CIE XYZ colors to colors in the new colorspace.
+</para>
+
+    <para>Both the CIE XYZ and the RGB colorspace that are derived from the
+specific chromaticity primaries are linear colorspaces. But neither the eye,
+nor display technology is linear. Doubling the values of all components in
+the linear colorspace will not be perceived as twice the intensity of the color.
+So each colorspace also defines a transfer function that takes a linear color
+component value and transforms it to the non-linear component value, which is a
+closer match to the non-linear performance of both the eye and displays. Linear
+component values are denoted RGB, non-linear are denoted as R'G'B'. In general
+colors used in graphics are all R'G'B', except in openGL which uses linear RGB.
+Special care should be taken when dealing with openGL to provide linear RGB colors
+or to use the built-in openGL support to apply the inverse transfer function.</para>
+
+    <para>The final piece that defines a colorspace is a function that
+transforms non-linear R'G'B' to non-linear Y'CbCr. This function is determined
+by the so-called luma coefficients. There may be multiple possible Y'CbCr
+encodings allowed for the same colorspace. Many encodings of color
+prefer to use luma (Y') and chroma (CbCr) instead of R'G'B'. Since the human
+eye is more sensitive to differences in luminance than in color this encoding
+allows one to reduce the amount of color information compared to the luma
+data. Note that the luma (Y') is unrelated to the Y in the CIE XYZ colorspace.
+Also note that Y'CbCr is often called YCbCr or YUV even though these are
+strictly speaking wrong.</para>
+
+    <para>Sometimes people confuse Y'CbCr as being a colorspace. This is not
+correct, it is just an encoding of an R'G'B' color into luma and chroma
+values. The underlying colorspace that is associated with the R'G'B' color
+is also associated with the Y'CbCr color.</para>
+
+    <para>The final step is how the RGB, R'G'B' or Y'CbCr values are
+quantized. The CIE XYZ colorspace where X, Y and Z are in the range
+[0&hellip;1] describes all colors that humans can perceive, but the transform to
+another colorspace will produce colors that are outside the [0&hellip;1] range.
+Once clamped to the [0&hellip;1] range those colors can no longer be reproduced
+in that colorspace. This clamping is what reduces the extent or gamut of the
+colorspace. How the range of [0&hellip;1] is translated to integer values in the
+range of [0&hellip;255] (or higher, depending on the color depth) is called the
+quantization. This is <emphasis>not</emphasis> part of the colorspace
+definition. In practice RGB or R'G'B' values are full range, i.e. they
+use the full [0&hellip;255] range. Y'CbCr values on the other hand are limited
+range with Y' using [16&hellip;235] and Cb and Cr using [16&hellip;240].</para>
+
+    <para>Unfortunately, in some cases limited range RGB is also used
+where the components use the range [16&hellip;235]. And full range Y'CbCr also exists
+using the [0&hellip;255] range.</para>
+
+    <para>In order to correctly interpret a color you need to know the
+quantization range, whether it is R'G'B' or Y'CbCr, the used Y'CbCr encoding
+and the colorspace.
+From that information you can calculate the corresponding CIE XYZ color
+and map that again to whatever colorspace your display device uses.</para>
+
+    <para>The colorspace definition itself consists of the three
+chromaticity primaries, the white reference chromaticity, a transfer
+function and the luma coefficients needed to transform R'G'B' to Y'CbCr. While
+some colorspace standards correctly define all four, quite often the colorspace
+standard only defines some, and you have to rely on other standards for
+the missing pieces. The fact that colorspaces are often a mix of different
+standards also led to very confusing naming conventions where the name of
+a standard was used to name a colorspace when in fact that standard was
+part of various other colorspaces as well.</para>
+
+    <para>If you want to read more about colors and colorspaces, then the
+following resources are useful: <xref linkend="poynton" /> is a good practical
+book for video engineers, <xref linkend="colimg" /> has a much broader scope and
+describes many more aspects of color (physics, chemistry, biology, etc.).
+The <ulink url="http://www.brucelindbloom.com">http://www.brucelindbloom.com</ulink>
+website is an excellent resource, especially with respect to the mathematics behind
+colorspace conversions. The wikipedia <ulink url="http://en.wikipedia.org/wiki/CIE_1931_color_space#CIE_xy_chromaticity_diagram_and_the_CIE_xyY_color_space">CIE 1931 colorspace</ulink> article
+is also very useful.</para>
+  </section>
+
+  <section>
+    <title>Defining Colorspaces in V4L2</title>
+    <para>In V4L2 colorspaces are defined by three values. The first is the colorspace
+identifier (&v4l2-colorspace;) which defines the chromaticities, the transfer
+function, the default Y'CbCr encoding and the default quantization method. The second
+is the Y'CbCr encoding identifier (&v4l2-ycbcr-encoding;) to specify non-standard
+Y'CbCr encodings and the third is the quantization identifier (&v4l2-quantization;)
+to specify non-standard quantization methods. Most of the time only the colorspace
+field of &v4l2-pix-format; or &v4l2-pix-format-mplane; needs to be filled in. Note