From 4266129964b8238526936d723de65b419d8069c6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 31 May 2011 16:27:44 -0300 Subject: [PATCH] [media] DocBook: Move all media docbook stuff into its own directory This patch addresses several issues pointed by Randy Dunlap at changeset ece722c: - In the generated index.html file, "media" is listed first, but it should be listed in alphabetical order, not first. - The generated files are (hidden) in .tmpmedia/ - The link from the top-level index.html file to "media" is to media/index.html, but the file is actually in .tmpmedia/media/index.html - Please build docs with and without using "O=builddir" and test that. - Would it be possible for media to have its own Makefile instead of merging into this one? Due to the way cleandocs target works, I had to rename the media DocBook to media_api, otherwise cleandocs would remove the /media directory. Thanks-to: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab --- Documentation/DocBook/.gitignore | 11 +- Documentation/DocBook/Makefile | 261 +--------- Documentation/DocBook/media-entities.tmpl | 464 ------------------ Documentation/DocBook/media/Makefile | 259 ++++++++++ .../DocBook/{ => media}/dvb/.gitignore | 0 .../DocBook/{ => media}/dvb/audio.xml | 0 Documentation/DocBook/{ => media}/dvb/ca.xml | 0 .../DocBook/{ => media}/dvb/demux.xml | 0 .../DocBook/{ => media}/dvb/dvbapi.xml | 0 .../DocBook/{ => media}/dvb/dvbproperty.xml | 0 .../DocBook/{ => media}/dvb/dvbstb.pdf | Bin .../DocBook/{ => media}/dvb/dvbstb.png | Bin .../DocBook/{ => media}/dvb/examples.xml | 0 .../DocBook/{ => media}/dvb/frontend.xml | 0 .../DocBook/{ => media}/dvb/intro.xml | 0 .../DocBook/{ => media}/dvb/kdapi.xml | 0 Documentation/DocBook/{ => media}/dvb/net.xml | 0 .../DocBook/{ => media}/dvb/video.xml | 0 .../DocBook/{ => media}/v4l/.gitignore | 0 .../DocBook/{ => media}/v4l/bayer.pdf | Bin .../DocBook/{ => media}/v4l/bayer.png | Bin .../DocBook/{ => media}/v4l/biblio.xml | 0 .../DocBook/{ => media}/v4l/capture.c.xml | 0 .../DocBook/{ => media}/v4l/common.xml | 0 .../DocBook/{ => media}/v4l/compat.xml | 0 .../DocBook/{ => media}/v4l/controls.xml | 0 .../DocBook/{ => media}/v4l/crop.gif | Bin .../DocBook/{ => media}/v4l/crop.pdf | Bin .../DocBook/{ => media}/v4l/dev-capture.xml | 0 .../DocBook/{ => media}/v4l/dev-codec.xml | 0 .../DocBook/{ => media}/v4l/dev-effect.xml | 0 .../DocBook/{ => media}/v4l/dev-event.xml | 0 .../DocBook/{ => media}/v4l/dev-osd.xml | 0 .../DocBook/{ => media}/v4l/dev-output.xml | 0 .../DocBook/{ => media}/v4l/dev-overlay.xml | 0 .../DocBook/{ => media}/v4l/dev-radio.xml | 0 .../DocBook/{ => media}/v4l/dev-raw-vbi.xml | 0 .../DocBook/{ => media}/v4l/dev-rds.xml | 0 .../{ => media}/v4l/dev-sliced-vbi.xml | 0 .../DocBook/{ => media}/v4l/dev-subdev.xml | 0 .../DocBook/{ => media}/v4l/dev-teletext.xml | 0 .../DocBook/{ => media}/v4l/driver.xml | 0 .../DocBook/{ => media}/v4l/fdl-appendix.xml | 0 .../DocBook/{ => media}/v4l/fieldseq_bt.gif | Bin .../DocBook/{ => media}/v4l/fieldseq_bt.pdf | Bin .../DocBook/{ => media}/v4l/fieldseq_tb.gif | Bin .../DocBook/{ => media}/v4l/fieldseq_tb.pdf | Bin .../DocBook/{ => media}/v4l/func-close.xml | 0 .../DocBook/{ => media}/v4l/func-ioctl.xml | 0 .../DocBook/{ => media}/v4l/func-mmap.xml | 0 .../DocBook/{ => media}/v4l/func-munmap.xml | 0 .../DocBook/{ => media}/v4l/func-open.xml | 0 .../DocBook/{ => media}/v4l/func-poll.xml | 0 .../DocBook/{ => media}/v4l/func-read.xml | 0 .../DocBook/{ => media}/v4l/func-select.xml | 0 .../DocBook/{ => media}/v4l/func-write.xml | 0 Documentation/DocBook/{ => media}/v4l/io.xml | 0 .../DocBook/{ => media}/v4l/keytable.c.xml | 0 .../DocBook/{ => media}/v4l/libv4l.xml | 0 .../{ => media}/v4l/lirc_device_interface.xml | 0 .../{ => media}/v4l/media-controller.xml | 0 .../{ => media}/v4l/media-func-close.xml | 0 .../{ => media}/v4l/media-func-ioctl.xml | 0 .../{ => media}/v4l/media-func-open.xml | 0 .../{ => media}/v4l/media-ioc-device-info.xml | 0 .../v4l/media-ioc-enum-entities.xml | 0 .../{ => media}/v4l/media-ioc-enum-links.xml | 0 .../{ => media}/v4l/media-ioc-setup-link.xml | 0 .../DocBook/{ => media}/v4l/nv12mt.gif | Bin .../{ => media}/v4l/nv12mt_example.gif | Bin .../DocBook/{ => media}/v4l/pipeline.pdf | Bin .../DocBook/{ => media}/v4l/pipeline.png | Bin .../DocBook/{ => media}/v4l/pixfmt-grey.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-m420.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-nv12.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-nv16.xml | 0 .../{ => media}/v4l/pixfmt-packed-rgb.xml | 0 .../{ => media}/v4l/pixfmt-packed-yuv.xml | 0 .../{ => media}/v4l/pixfmt-sbggr16.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml | 0 .../{ => media}/v4l/pixfmt-srggb10.xml | 0 .../{ => media}/v4l/pixfmt-srggb12.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-y10.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-y10b.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-y12.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-y16.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-y41p.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml | 0 .../{ => media}/v4l/pixfmt-yuv411p.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml | 0 .../{ => media}/v4l/pixfmt-yuv420m.xml | 0 .../{ => media}/v4l/pixfmt-yuv422p.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml | 0 .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml | 0 .../DocBook/{ => media}/v4l/pixfmt.xml | 0 .../DocBook/{ => media}/v4l/planar-apis.xml | 0 .../{ => media}/v4l/remote_controllers.xml | 0 .../{ => media}/v4l/subdev-formats.xml | 0 .../DocBook/{ => media}/v4l/v4l2.xml | 0 .../DocBook/{ => media}/v4l/v4l2grab.c.xml | 0 .../DocBook/{ => media}/v4l/vbi_525.gif | Bin .../DocBook/{ => media}/v4l/vbi_525.pdf | Bin .../DocBook/{ => media}/v4l/vbi_625.gif | Bin .../DocBook/{ => media}/v4l/vbi_625.pdf | Bin .../DocBook/{ => media}/v4l/vbi_hsync.gif | Bin .../DocBook/{ => media}/v4l/vbi_hsync.pdf | Bin .../{ => media}/v4l/vidioc-cropcap.xml | 0 .../v4l/vidioc-dbg-g-chip-ident.xml | 0 .../{ => media}/v4l/vidioc-dbg-g-register.xml | 0 .../{ => media}/v4l/vidioc-dqevent.xml | 0 .../{ => media}/v4l/vidioc-encoder-cmd.xml | 0 .../v4l/vidioc-enum-dv-presets.xml | 0 .../{ => media}/v4l/vidioc-enum-fmt.xml | 0 .../v4l/vidioc-enum-frameintervals.xml | 0 .../v4l/vidioc-enum-framesizes.xml | 0 .../{ => media}/v4l/vidioc-enumaudio.xml | 0 .../{ => media}/v4l/vidioc-enumaudioout.xml | 0 .../{ => media}/v4l/vidioc-enuminput.xml | 0 .../{ => media}/v4l/vidioc-enumoutput.xml | 0 .../{ => media}/v4l/vidioc-enumstd.xml | 0 .../{ => media}/v4l/vidioc-g-audio.xml | 0 .../{ => media}/v4l/vidioc-g-audioout.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-crop.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml | 0 .../{ => media}/v4l/vidioc-g-dv-preset.xml | 0 .../{ => media}/v4l/vidioc-g-dv-timings.xml | 0 .../{ => media}/v4l/vidioc-g-enc-index.xml | 0 .../{ => media}/v4l/vidioc-g-ext-ctrls.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml | 0 .../{ => media}/v4l/vidioc-g-frequency.xml | 0 .../{ => media}/v4l/vidioc-g-input.xml | 0 .../{ => media}/v4l/vidioc-g-jpegcomp.xml | 0 .../{ => media}/v4l/vidioc-g-modulator.xml | 0 .../{ => media}/v4l/vidioc-g-output.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-parm.xml | 0 .../{ => media}/v4l/vidioc-g-priority.xml | 0 .../v4l/vidioc-g-sliced-vbi-cap.xml | 0 .../DocBook/{ => media}/v4l/vidioc-g-std.xml | 0 .../{ => media}/v4l/vidioc-g-tuner.xml | 0 .../{ => media}/v4l/vidioc-log-status.xml | 0 .../{ => media}/v4l/vidioc-overlay.xml | 0 .../DocBook/{ => media}/v4l/vidioc-qbuf.xml | 0 .../v4l/vidioc-query-dv-preset.xml | 0 .../{ => media}/v4l/vidioc-querybuf.xml | 0 .../{ => media}/v4l/vidioc-querycap.xml | 0 .../{ => media}/v4l/vidioc-queryctrl.xml | 0 .../{ => media}/v4l/vidioc-querystd.xml | 0 .../{ => media}/v4l/vidioc-reqbufs.xml | 0 .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml | 0 .../{ => media}/v4l/vidioc-streamon.xml | 0 .../v4l/vidioc-subdev-enum-frame-interval.xml | 0 .../v4l/vidioc-subdev-enum-frame-size.xml | 0 .../v4l/vidioc-subdev-enum-mbus-code.xml | 0 .../{ => media}/v4l/vidioc-subdev-g-crop.xml | 0 .../{ => media}/v4l/vidioc-subdev-g-fmt.xml | 0 .../v4l/vidioc-subdev-g-frame-interval.xml | 0 .../v4l/vidioc-subscribe-event.xml | 0 .../DocBook/{media.tmpl => media_api.tmpl} | 0 166 files changed, 275 insertions(+), 720 deletions(-) delete mode 100644 Documentation/DocBook/media-entities.tmpl create mode 100644 Documentation/DocBook/media/Makefile rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%) rename Documentation/DocBook/{ => media}/dvb/audio.xml (100%) rename Documentation/DocBook/{ => media}/dvb/ca.xml (100%) rename Documentation/DocBook/{ => media}/dvb/demux.xml (100%) rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (100%) rename Documentation/DocBook/{ => media}/dvb/dvbproperty.xml (100%) rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%) rename Documentation/DocBook/{ => media}/dvb/dvbstb.png (100%) rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%) rename Documentation/DocBook/{ => media}/dvb/frontend.xml (100%) rename Documentation/DocBook/{ => media}/dvb/intro.xml (100%) rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%) rename Documentation/DocBook/{ => media}/dvb/net.xml (100%) rename Documentation/DocBook/{ => media}/dvb/video.xml (100%) rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%) rename Documentation/DocBook/{ => media}/v4l/bayer.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/bayer.png (100%) rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%) rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%) rename Documentation/DocBook/{ => media}/v4l/common.xml (100%) rename Documentation/DocBook/{ => media}/v4l/compat.xml (100%) rename Documentation/DocBook/{ => media}/v4l/controls.xml (100%) rename Documentation/DocBook/{ => media}/v4l/crop.gif (100%) rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-event.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%) rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%) rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%) rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%) rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.gif (100%) rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.gif (100%) rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-ioctl.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%) rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%) rename Documentation/DocBook/{ => media}/v4l/io.xml (100%) rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%) rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%) rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (100%) rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (100%) rename Documentation/DocBook/{ => media}/v4l/nv12mt.gif (100%) rename Documentation/DocBook/{ => media}/v4l/nv12mt_example.gif (100%) rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/pipeline.png (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%) rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (100%) rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%) rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%) rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (100%) rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (100%) rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_525.gif (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_625.gif (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.gif (100%) rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%) rename Documentation/DocBook/{ => media}/v4l/vidioc-subscribe-event.xml (100%) rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (100%) diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore index 679034cbd686..2c8c882038bf 100644 --- a/Documentation/DocBook/.gitignore +++ b/Documentation/DocBook/.gitignore @@ -8,4 +8,13 @@ *.dvi *.log *.out -media/ +crop.gif +dvbstb.png +fieldseq_bt.gif +fieldseq_tb.gif +media-indices.tmpl +nv12mt.gif +nv12mt_example.gif +vbi_525.gif +vbi_625.gif +vbi_hsync.gif diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 595bdd3acb6d..5125277bd6a4 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -6,8 +6,6 @@ # To add a new book the only step required is to add the book to the # list of DOCBOOKS. -TMPMEDIA=.tmpmedia - DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ writing_usb_driver.xml networking.xml \ @@ -16,7 +14,9 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ 80211.xml debugobjects.xml sh.xml regulator.xml \ alsa-driver-api.xml writing-an-alsa-driver.xml \ - tracepoint.xml $(TMPMEDIA)/media.xml drm.xml + tracepoint.xml drm.xml media_api.xml + +include $(srctree)/Documentation/DocBook/media/Makefile ### # The build process is as follows (targets): @@ -34,7 +34,7 @@ PS_METHOD = $(prefer-db2x) ### # The targets that may be used. -PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs mediaprep +PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) xmldocs: $(BOOKS) @@ -228,9 +228,9 @@ clean-files := $(DOCBOOKS) \ $(patsubst %.xml, %.9, $(DOCBOOKS)) \ $(index) -clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man $(MEDIA_DIR) +clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man -cleandocs: +cleandocs: cleanmediadocs $(Q)rm -f $(call objectify, $(clean-files)) $(Q)rm -rf $(call objectify, $(clean-dirs)) @@ -238,252 +238,3 @@ cleandocs: # information in a variable se we can use it in if_changed and friends. .PHONY: $(PHONY) - - -# -# Media build rules - Auto-generates media contents/indexes and *.h xml's -# - -SHELL=/bin/bash - -MEDIA_DIR=$(objtree)/Documentation/DocBook/$(TMPMEDIA) - -V4L_SGMLS = \ - $(shell ls $(srctree)/Documentation/DocBook/v4l/*.xml|perl -ne 'print "$$1 " if (m,.*/(.*)\n,)') \ - capture.c.xml \ - keytable.c.xml \ - v4l2grab.c.xml - -DVB_SGMLS = \ - $(shell ls $(srctree)/Documentation/DocBook/dvb/*.xml|perl -ne 'print "$$1 " if (m,.*/(.*)\n,)') - -MEDIA_TEMP = media-entities.tmpl \ - media-indices.tmpl \ - videodev2.h.xml \ - frontend.h.xml - -MEDIA_SGMLS = $(addprefix ./,$(V4L_SGMLS)) $(addprefix ./,$(DVB_SGMLS)) $(addprefix ./,$(MEDIA_TEMP)) - -MEDIA_TEMP_OBJ := $(addprefix $(MEDIA_DIR)/,$(MEDIA_TEMP)) - -FUNCS = \ - close \ - ioctl \ - mmap \ - munmap \ - open \ - poll \ - read \ - select \ - write \ - -IOCTLS = \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \ - VIDIOC_SUBDEV_G_FRAME_INTERVAL \ - VIDIOC_SUBDEV_S_FRAME_INTERVAL \ - VIDIOC_SUBDEV_ENUM_MBUS_CODE \ - VIDIOC_SUBDEV_ENUM_FRAME_SIZE \ - VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \ - -TYPES = \ - $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) - -ENUMS = \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) - -STRUCTS = \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) - -ERRORS = \ - EACCES \ - EAGAIN \ - EBADF \ - EBUSY \ - EFAULT \ - EIO \ - EINTR \ - EINVAL \ - ENFILE \ - ENOMEM \ - ENOSPC \ - ENOTTY \ - ENXIO \ - EMFILE \ - EPERM \ - ERANGE \ - EPIPE \ - -ESCAPE = \ - -e "s/&/\\&/g" \ - -e "s//\\>/g" - -FILENAME = \ - -e s,"^[^\/]*/",, \ - -e s/"\\.xml"// \ - -e s/"\\.tmpl"// \ - -e s/\\\./-/g \ - -e s/"^func-"// \ - -e s/"^pixfmt-"// \ - -e s/"^vidioc-"// - -# Generate references to these structs in videodev2.h.xml. -DOCUMENTED = \ - -e "s/\(enum *\)v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1v4l2_mpeg_cx2341x_video_\2<\/link>/g" \ - -e "s/\(\(enum\|struct\) *\)\(v4l2_[a-zA-Z0-9_]*\)/\1\3<\/link>/g" \ - -e "s/\(V4L2_PIX_FMT_[A-Z0-9_]\+\) /\1<\/link> /g" \ - -e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \ - -e "s/v4l2\-mpeg\-vbi\-ITV0/v4l2-mpeg-vbi-itv0-1/g" - -DVB_DOCUMENTED = \ - -e "s,\(define \)\([A-Z0-9_]\+\)\(\s\+_IO\),\1\\2\<\/link\>\3,g" \ - -e "s/\(linkend\=\"\)FE_SET_PROPERTY/\1FE_GET_PROPERTY/g" - - -# -# Media targets and dependencies -# - -$(obj)/$(TMPMEDIA)/media.xml: $(obj)/media.tmpl $(MEDIA_TEMP_OBJ) FORCE - $(call if_changed_rule,docproc) - -$(MEDIA_DIR)/v4l2.xml: - @$($(quiet)gen_xml) - @(mkdir -p $(MEDIA_DIR)) - @(cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(MEDIA_DIR)/) - @(ln -sf $(srctree)/Documentation/DocBook/v4l/*xml $(MEDIA_DIR)/) - @(ln -sf $(srctree)/Documentation/DocBook/dvb/*xml $(MEDIA_DIR)/) - -$(MEDIA_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_DIR)/v4l2.xml - @$($(quiet)gen_xml) - @( \ - echo "") > $@ - @( \ - expand --tabs=8 < $< | \ - sed $(ESCAPE) $(DOCUMENTED) | \ - sed 's/i\.e\./&ie;/') >> $@ - @( \ - echo "") >> $@ - -$(MEDIA_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_DIR)/v4l2.xml - @$($(quiet)gen_xml) - @( \ - echo "") > $@ - @( \ - expand --tabs=8 < $< | \ - sed $(ESCAPE) $(DVB_DOCUMENTED) | \ - sed 's/i\.e\./&ie;/') >> $@ - @( \ - echo "") >> $@ - -$(MEDIA_DIR)/media-entities.tmpl: $(MEDIA_DIR)/v4l2.xml - @$($(quiet)gen_xml) - @( \ - echo "") >$@ - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(FUNCS) ; do \ - entity=`echo $$ident | tr _ -` ; \ - echo "$$ident()\">" \ - >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(IOCTLS) ; do \ - entity=`echo $$ident | tr _ -` ; \ - id=`grep "$$ident" $(MEDIA_DIR)/vidioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ - echo "$$ident\">" \ - >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(TYPES) ; do \ - entity=`echo $$ident | tr _ -` ; \ - echo "$$ident\">" >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(ENUMS) ; do \ - entity=`echo $$ident | sed -e "s/v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1/" | tr _ -` ; \ - echo "$$ident\">" >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(STRUCTS) ; do \ - entity=`echo $$ident | tr _ - | sed s/v4l2-mpeg-vbi-ITV0/v4l2-mpeg-vbi-itv0-1/g` ; \ - echo "$$ident\">" >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for ident in $(ERRORS) ; do \ - echo "$$ident" \ - "error code\">" >>$@ ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for file in $(MEDIA_SGMLS) ; do \ - entity=`echo "$$file" | sed $(FILENAME) -e s/"^([^-]*)"/sub\1/` ; \ - if ! echo "$$file" | \ - grep -q -E -e '^(func|vidioc|pixfmt)-' ; then \ - echo "" >>$@ ; \ - fi ; \ - done) - @( \ - echo -e "\n") >>$@ - @( \ - for file in $(MEDIA_SGMLS) ; do \ - if echo "$$file" | \ - grep -q -E -e '(func|vidioc|pixfmt)-' ; then \ - entity=`echo "$$file" |sed $(FILENAME)` ; \ - echo "" >>$@ ; \ - fi ; \ - done) - -# Jade can auto-generate a list-of-tables, which includes all structs, -# but we only want data types, all types, and sorted please. -$(MEDIA_DIR)/media-indices.tmpl: $(MEDIA_DIR)/v4l2.xml - @$($(quiet)gen_xml) - @( \ - echo "") >$@ - @( \ - echo -e "\nList of Types") >>$@ - @( \ - for ident in $(TYPES) ; do \ - id=`echo $$ident | tr _ -` ; \ - echo "$$ident" >>$@ ; \ - done) - @( \ - for ident in $(ENUMS) ; do \ - id=`echo $$ident | sed -e "s/v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1/" | tr _ -`; \ - echo "enum $$ident" >>$@ ; \ - done) - @( \ - for ident in $(STRUCTS) ; do \ - id=`echo $$ident | tr _ - | sed s/v4l2-mpeg-vbi-ITV0/v4l2-mpeg-vbi-itv0-1/g` ; \ - echo "struct $$ident" >>$@ ; \ - done) - @( \ - echo "") >>$@ diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl deleted file mode 100644 index e5fe09430fd9..000000000000 --- a/Documentation/DocBook/media-entities.tmpl +++ /dev/null @@ -1,464 +0,0 @@ - - - -close()"> -ioctl()"> -mmap()"> -munmap()"> -open()"> -poll()"> -read()"> -select()"> -write()"> - -close()"> -ioctl()"> -open()"> - - -VIDIOC_CROPCAP"> -VIDIOC_DBG_G_CHIP_IDENT"> -VIDIOC_DBG_G_REGISTER"> -VIDIOC_DBG_S_REGISTER"> -VIDIOC_DQBUF"> -VIDIOC_DQEVENT"> -VIDIOC_ENCODER_CMD"> -VIDIOC_ENUMAUDIO"> -VIDIOC_ENUMAUDOUT"> -VIDIOC_ENUMINPUT"> -VIDIOC_ENUMOUTPUT"> -VIDIOC_ENUMSTD"> -VIDIOC_ENUM_DV_PRESETS"> -VIDIOC_ENUM_FMT"> -VIDIOC_ENUM_FRAMEINTERVALS"> -VIDIOC_ENUM_FRAMESIZES"> -VIDIOC_G_AUDIO"> -VIDIOC_G_AUDOUT"> -VIDIOC_G_CROP"> -VIDIOC_G_CTRL"> -VIDIOC_G_DV_PRESET"> -VIDIOC_G_DV_TIMINGS"> -VIDIOC_G_ENC_INDEX"> -VIDIOC_G_EXT_CTRLS"> -VIDIOC_G_FBUF"> -VIDIOC_G_FMT"> -VIDIOC_G_FREQUENCY"> -VIDIOC_G_INPUT"> -VIDIOC_G_JPEGCOMP"> -VIDIOC_G_MPEGCOMP"> -VIDIOC_G_MODULATOR"> -VIDIOC_G_OUTPUT"> -VIDIOC_G_PARM"> -VIDIOC_G_PRIORITY"> -VIDIOC_G_SLICED_VBI_CAP"> -VIDIOC_G_STD"> -VIDIOC_G_TUNER"> -VIDIOC_LOG_STATUS"> -VIDIOC_OVERLAY"> -VIDIOC_QBUF"> -VIDIOC_QUERYBUF"> -VIDIOC_QUERYCAP"> -VIDIOC_QUERYCTRL"> -VIDIOC_QUERYMENU"> -VIDIOC_QUERYSTD"> -VIDIOC_QUERY_DV_PRESET"> -VIDIOC_REQBUFS"> -VIDIOC_STREAMOFF"> -VIDIOC_STREAMON"> -VIDIOC_SUBSCRIBE_EVENT"> -VIDIOC_S_AUDIO"> -VIDIOC_S_AUDOUT"> -VIDIOC_S_CROP"> -VIDIOC_S_CTRL"> -VIDIOC_S_DV_PRESET"> -VIDIOC_S_DV_TIMINGS"> -VIDIOC_S_EXT_CTRLS"> -VIDIOC_S_FBUF"> -VIDIOC_S_FMT"> -VIDIOC_S_FREQUENCY"> -VIDIOC_S_HW_FREQ_SEEK"> -VIDIOC_S_INPUT"> -VIDIOC_S_JPEGCOMP"> -VIDIOC_S_MPEGCOMP"> -VIDIOC_S_MODULATOR"> -VIDIOC_S_OUTPUT"> -VIDIOC_S_PARM"> -VIDIOC_S_PRIORITY"> -VIDIOC_S_STD"> -VIDIOC_S_TUNER"> -VIDIOC_SUBDEV_ENUM_FRAME_SIZE"> -VIDIOC_SUBDEV_ENUM_MBUS_CODE"> -VIDIOC_SUBDEV_G_CROP"> -VIDIOC_SUBDEV_G_FMT"> -VIDIOC_SUBDEV_G_FRAME_INTERVAL"> -VIDIOC_SUBDEV_S_CROP"> -VIDIOC_SUBDEV_S_FMT"> -VIDIOC_SUBDEV_S_FRAME_INTERVAL"> -VIDIOC_TRY_ENCODER_CMD"> -VIDIOC_TRY_EXT_CTRLS"> -VIDIOC_TRY_FMT"> -VIDIOC_UNSUBSCRIBE_EVENT"> - -MEDIA_IOC_DEVICE_INFO"> -MEDIA_IOC_ENUM_ENTITIES"> -MEDIA_IOC_ENUM_LINKS"> -MEDIA_IOC_SETUP_LINK"> - - -v4l2_std_id"> - - -v4l2_buf_type"> -v4l2_colorspace"> -v4l2_ctrl_type"> -v4l2_exposure_auto_type"> -v4l2_field"> -v4l2_frmivaltypes"> -v4l2_frmsizetypes"> -v4l2_mbus_pixelcode"> -v4l2_memory"> -v4l2_mpeg_audio_ac3_bitrate"> -v4l2_mpeg_audio_crc"> -v4l2_mpeg_audio_emphasis"> -v4l2_mpeg_audio_encoding"> -v4l2_mpeg_audio_l1_bitrate"> -v4l2_mpeg_audio_l2_bitrate"> -v4l2_mpeg_audio_l3_bitrate"> -v4l2_mpeg_audio_mode"> -v4l2_mpeg_audio_mode_extension"> -v4l2_mpeg_audio_sampling_freq"> -v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type"> -v4l2_mpeg_cx2341x_video_luma_spatial_filter_type"> -v4l2_mpeg_cx2341x_video_median_filter_type"> -v4l2_mpeg_cx2341x_video_spatial_filter_mode"> -v4l2_mpeg_cx2341x_video_temporal_filter_mode"> -v4l2_mpeg_stream_type"> -v4l2_mpeg_stream_vbi_fmt"> -v4l2_mpeg_video_aspect"> -v4l2_mpeg_video_bitrate_mode"> -v4l2_mpeg_video_encoding"> -v4l2_power_line_frequency"> -v4l2_priority"> -v4l2_subdev_format_whence"> -v4l2_tuner_type"> -v4l2_preemphasis"> - - -v4l2_audio"> -v4l2_audioout"> -v4l2_bt_timings"> -v4l2_buffer"> -v4l2_plane"> -v4l2_capability"> -v4l2_captureparm"> -v4l2_clip"> -v4l2_control"> -v4l2_crop"> -v4l2_cropcap"> -v4l2_dbg_chip_ident"> -v4l2_dbg_match"> -v4l2_dbg_register"> -v4l2_dv_enum_preset"> -v4l2_dv_preset"> -v4l2_dv_timings"> -v4l2_enc_idx"> -v4l2_enc_idx_entry"> -v4l2_encoder_cmd"> -v4l2_event"> -v4l2_event_subscription"> -v4l2_event_vsync"> -v4l2_ext_control"> -v4l2_ext_controls"> -v4l2_fmtdesc"> -v4l2_format"> -v4l2_fract"> -v4l2_framebuffer"> -v4l2_frequency"> -v4l2_frmival_stepwise"> -v4l2_frmivalenum"> -v4l2_frmsize_discrete"> -v4l2_frmsize_stepwise"> -v4l2_frmsizeenum"> -v4l2_hw_freq_seek"> -v4l2_input"> -v4l2_jpegcompression"> -v4l2_mbus_framefmt"> -v4l2_modulator"> -v4l2_mpeg_vbi_fmt_ivtv"> -v4l2_output"> -v4l2_outputparm"> -v4l2_pix_format"> -v4l2_pix_format_mplane"> -v4l2_plane_pix_format"> -v4l2_queryctrl"> -v4l2_querymenu"> -v4l2_rect"> -v4l2_requestbuffers"> -v4l2_sliced_vbi_cap"> -v4l2_sliced_vbi_data"> -v4l2_sliced_vbi_format"> -v4l2_subdev_frame_interval"> -v4l2_subdev_frame_interval_enum"> -v4l2_subdev_frame_size_enum"> -v4l2_subdev_crop"> -v4l2_subdev_format"> -v4l2_subdev_mbus_code_enum"> -v4l2_standard"> -v4l2_streamparm"> -v4l2_timecode"> -v4l2_tuner"> -v4l2_vbi_format"> -v4l2_window"> - -media_device_info"> -media_entity_desc"> -media_links_enum"> -media_pad_desc"> -media_link_desc"> - - -EACCES error code"> -EAGAIN error code"> -EBADF error code"> -EBUSY error code"> -EFAULT error code"> -EIO error code"> -EINTR error code"> -EINVAL error code"> -ENFILE error code"> -ENOMEM error code"> -ENOSPC error code"> -ENOTTY error code"> -ENXIO error code"> -EMFILE error code"> -EPERM error code"> -EPIPE error code"> -ERANGE error code"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile new file mode 100644 index 000000000000..baeea174fdc6 --- /dev/null +++ b/Documentation/DocBook/media/Makefile @@ -0,0 +1,259 @@ +### +# Media build rules - Auto-generates media contents/indexes and *.h xml's +# + +SHELL=/bin/bash + +MEDIA_OBJ_DIR=$(objtree)/Documentation/DocBook/ +MEDIA_SRC_DIR=$(srctree)/Documentation/DocBook/media + +MEDIA_TEMP = media-entities.tmpl \ + media-indices.tmpl \ + videodev2.h.xml \ + v4l2.xml \ + frontend.h.xml + +IMGFILES := $(addprefix $(MEDIA_OBJ_DIR)/media/, $(notdir $(shell ls $(MEDIA_SRC_DIR)/*/*.gif $(MEDIA_SRC_DIR)/*/*.png))) +GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) + +PHONY += cleanmediadocs mediaindexdocs + +cleanmediadocs: + -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) + +$(obj)/media_api.xml: $(GENFILES) FORCE + +#$(MEDIA_OBJ_DIR)/media_api.html: $(MEDIA_OBJ_DIR)/media_api.xml +#$(MEDIA_OBJ_DIR)/media_api.pdf: $(MEDIA_OBJ_DIR)/media_api.xml +#$(MEDIA_OBJ_DIR)/media_api.ps: $(MEDIA_OBJ_DIR)/media_api.xml + +V4L_SGMLS = \ + $(shell ls $(MEDIA_SRC_DIR)/v4l/*.xml|perl -ne 'print "$$1 " if (m,.*/(.*)\n,)') \ + capture.c.xml \ + keytable.c.xml \ + v4l2grab.c.xml + +DVB_SGMLS = \ + $(shell ls $(MEDIA_SRC_DIR)/dvb/*.xml|perl -ne 'print "$$1 " if (m,.*/(.*)\n,)') + +MEDIA_SGMLS = $(addprefix ./,$(V4L_SGMLS)) $(addprefix ./,$(DVB_SGMLS)) $(addprefix ./,$(MEDIA_TEMP)) + +FUNCS = \ + close \ + ioctl \ + mmap \ + munmap \ + open \ + poll \ + read \ + select \ + write \ + +IOCTLS = \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \ + VIDIOC_SUBDEV_G_FRAME_INTERVAL \ + VIDIOC_SUBDEV_S_FRAME_INTERVAL \ + VIDIOC_SUBDEV_ENUM_MBUS_CODE \ + VIDIOC_SUBDEV_ENUM_FRAME_SIZE \ + VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \ + +TYPES = \ + $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) + +ENUMS = \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) + +STRUCTS = \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) + +ERRORS = \ + EACCES \ + EAGAIN \ + EBADF \ + EBUSY \ + EFAULT \ + EIO \ + EINTR \ + EINVAL \ + ENFILE \ + ENOMEM \ + ENOSPC \ + ENOTTY \ + ENXIO \ + EMFILE \ + EPERM \ + ERANGE \ + EPIPE \ + +ESCAPE = \ + -e "s/&/\\&/g" \ + -e "s//\\>/g" + +FILENAME = \ + -e s,"^[^\/]*/",, \ + -e s/"\\.xml"// \ + -e s/"\\.tmpl"// \ + -e s/\\\./-/g \ + -e s/"^func-"// \ + -e s/"^pixfmt-"// \ + -e s/"^vidioc-"// + +# Generate references to these structs in videodev2.h.xml. +DOCUMENTED = \ + -e "s/\(enum *\)v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1v4l2_mpeg_cx2341x_video_\2<\/link>/g" \ + -e "s/\(\(enum\|struct\) *\)\(v4l2_[a-zA-Z0-9_]*\)/\1\3<\/link>/g" \ + -e "s/\(V4L2_PIX_FMT_[A-Z0-9_]\+\) /\1<\/link> /g" \ + -e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \ + -e "s/v4l2\-mpeg\-vbi\-ITV0/v4l2-mpeg-vbi-itv0-1/g" + +DVB_DOCUMENTED = \ + -e "s,\(define \)\([A-Z0-9_]\+\)\(\s\+_IO\),\1\\2\<\/link\>\3,g" \ + -e "s/\(linkend\=\"\)FE_SET_PROPERTY/\1FE_GET_PROPERTY/g" + + +# +# Media targets and dependencies +# + +$(MEDIA_OBJ_DIR)/v4l2.xml: + @$($(quiet)gen_xml) + @(mkdir -p $(MEDIA_OBJ_DIR)/media) + @(cp $(MEDIA_SRC_DIR)/dvb/*.png $(MEDIA_SRC_DIR)/v4l/*.gif $(MEDIA_OBJ_DIR)/media/) + @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/) + @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/) + +$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml + @$($(quiet)gen_xml) + @( \ + echo "") > $@ + @( \ + expand --tabs=8 < $< | \ + sed $(ESCAPE) $(DOCUMENTED) | \ + sed 's/i\.e\./&ie;/') >> $@ + @( \ + echo "") >> $@ + +$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml + @$($(quiet)gen_xml) + @( \ + echo "") > $@ + @( \ + expand --tabs=8 < $< | \ + sed $(ESCAPE) $(DVB_DOCUMENTED) | \ + sed 's/i\.e\./&ie;/') >> $@ + @( \ + echo "") >> $@ + +$(MEDIA_OBJ_DIR)/media-entities.tmpl: $(MEDIA_OBJ_DIR)/v4l2.xml + @$($(quiet)gen_xml) + @( \ + echo "") >$@ + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(FUNCS) ; do \ + entity=`echo $$ident | tr _ -` ; \ + echo "$$ident()\">" \ + >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(IOCTLS) ; do \ + entity=`echo $$ident | tr _ -` ; \ + id=`grep "$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ + echo "$$ident\">" \ + >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(TYPES) ; do \ + entity=`echo $$ident | tr _ -` ; \ + echo "$$ident\">" >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(ENUMS) ; do \ + entity=`echo $$ident | sed -e "s/v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1/" | tr _ -` ; \ + echo "$$ident\">" >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(STRUCTS) ; do \ + entity=`echo $$ident | tr _ - | sed s/v4l2-mpeg-vbi-ITV0/v4l2-mpeg-vbi-itv0-1/g` ; \ + echo "$$ident\">" >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for ident in $(ERRORS) ; do \ + echo "$$ident" \ + "error code\">" >>$@ ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for file in $(MEDIA_SGMLS) ; do \ + entity=`echo "$$file" | sed $(FILENAME) -e s/"^([^-]*)"/sub\1/` ; \ + if ! echo "$$file" | \ + grep -q -E -e '^(func|vidioc|pixfmt)-' ; then \ + echo "" >>$@ ; \ + fi ; \ + done) + @( \ + echo -e "\n") >>$@ + @( \ + for file in $(MEDIA_SGMLS) ; do \ + if echo "$$file" | \ + grep -q -E -e '(func|vidioc|pixfmt)-' ; then \ + entity=`echo "$$file" |sed $(FILENAME)` ; \ + echo "" >>$@ ; \ + fi ; \ + done) + +# Jade can auto-generate a list-of-tables, which includes all structs, +# but we only want data types, all types, and sorted please. +$(MEDIA_OBJ_DIR)/media-indices.tmpl: $(MEDIA_OBJ_DIR)/v4l2.xml + @$($(quiet)gen_xml) + @( \ + echo "") >$@ + @( \ + echo -e "\nList of Types") >>$@ + @( \ + for ident in $(TYPES) ; do \ + id=`echo $$ident | tr _ -` ; \ + echo "$$ident" >>$@ ; \ + done) + @( \ + for ident in $(ENUMS) ; do \ + id=`echo $$ident | sed -e "s/v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1/" | tr _ -`; \ + echo "enum $$ident" >>$@ ; \ + done) + @( \ + for ident in $(STRUCTS) ; do \ + id=`echo $$ident | tr _ - | sed s/v4l2-mpeg-vbi-ITV0/v4l2-mpeg-vbi-itv0-1/g` ; \ + echo "struct $$ident" >>$@ ; \ + done) + @( \ + echo "") >>$@ + diff --git a/Documentation/DocBook/dvb/.gitignore b/Documentation/DocBook/media/dvb/.gitignore similarity index 100% rename from Documentation/DocBook/dvb/.gitignore rename to Documentation/DocBook/media/dvb/.gitignore diff --git a/Documentation/DocBook/dvb/audio.xml b/Documentation/DocBook/media/dvb/audio.xml similarity index 100% rename from Documentation/DocBook/dvb/audio.xml rename to Documentation/DocBook/media/dvb/audio.xml diff --git a/Documentation/DocBook/dvb/ca.xml b/Documentation/DocBook/media/dvb/ca.xml similarity index 100% rename from Documentation/DocBook/dvb/ca.xml rename to Documentation/DocBook/media/dvb/ca.xml diff --git a/Documentation/DocBook/dvb/demux.xml b/Documentation/DocBook/media/dvb/demux.xml similarity index 100% rename from Documentation/DocBook/dvb/demux.xml rename to Documentation/DocBook/media/dvb/demux.xml diff --git a/Documentation/DocBook/dvb/dvbapi.xml b/Documentation/DocBook/media/dvb/dvbapi.xml similarity index 100% rename from Documentation/DocBook/dvb/dvbapi.xml rename to Documentation/DocBook/media/dvb/dvbapi.xml diff --git a/Documentation/DocBook/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml similarity index 100% rename from Documentation/DocBook/dvb/dvbproperty.xml rename to Documentation/DocBook/media/dvb/dvbproperty.xml diff --git a/Documentation/DocBook/dvb/dvbstb.pdf b/Documentation/DocBook/media/dvb/dvbstb.pdf similarity index 100% rename from Documentation/DocBook/dvb/dvbstb.pdf rename to Documentation/DocBook/media/dvb/dvbstb.pdf diff --git a/Documentation/DocBook/dvb/dvbstb.png b/Documentation/DocBook/media/dvb/dvbstb.png similarity index 100% rename from Documentation/DocBook/dvb/dvbstb.png rename to Documentation/DocBook/media/dvb/dvbstb.png diff --git a/Documentation/DocBook/dvb/examples.xml b/Documentation/DocBook/media/dvb/examples.xml similarity index 100% rename from Documentation/DocBook/dvb/examples.xml rename to Documentation/DocBook/media/dvb/examples.xml diff --git a/Documentation/DocBook/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml similarity index 100% rename from Documentation/DocBook/dvb/frontend.xml rename to Documentation/DocBook/media/dvb/frontend.xml diff --git a/Documentation/DocBook/dvb/intro.xml b/Documentation/DocBook/media/dvb/intro.xml similarity index 100% rename from Documentation/DocBook/dvb/intro.xml rename to Documentation/DocBook/media/dvb/intro.xml diff --git a/Documentation/DocBook/dvb/kdapi.xml b/Documentation/DocBook/media/dvb/kdapi.xml similarity index 100% rename from Documentation/DocBook/dvb/kdapi.xml rename to Documentation/DocBook/media/dvb/kdapi.xml diff --git a/Documentation/DocBook/dvb/net.xml b/Documentation/DocBook/media/dvb/net.xml similarity index 100% rename from Documentation/DocBook/dvb/net.xml rename to Documentation/DocBook/media/dvb/net.xml diff --git a/Documentation/DocBook/dvb/video.xml b/Documentation/DocBook/media/dvb/video.xml similarity index 100% rename from Documentation/DocBook/dvb/video.xml rename to Documentation/DocBook/media/dvb/video.xml diff --git a/Documentation/DocBook/v4l/.gitignore b/Documentation/DocBook/media/v4l/.gitignore similarity index 100% rename from Documentation/DocBook/v4l/.gitignore rename to Documentation/DocBook/media/v4l/.gitignore diff --git a/Documentation/DocBook/v4l/bayer.pdf b/Documentation/DocBook/media/v4l/bayer.pdf similarity index 100% rename from Documentation/DocBook/v4l/bayer.pdf rename to Documentation/DocBook/media/v4l/bayer.pdf diff --git a/Documentation/DocBook/v4l/bayer.png b/Documentation/DocBook/media/v4l/bayer.png similarity index 100% rename from Documentation/DocBook/v4l/bayer.png rename to Documentation/DocBook/media/v4l/bayer.png diff --git a/Documentation/DocBook/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml similarity index 100% rename from Documentation/DocBook/v4l/biblio.xml rename to Documentation/DocBook/media/v4l/biblio.xml diff --git a/Documentation/DocBook/v4l/capture.c.xml b/Documentation/DocBook/media/v4l/capture.c.xml similarity index 100% rename from Documentation/DocBook/v4l/capture.c.xml rename to Documentation/DocBook/media/v4l/capture.c.xml diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml similarity index 100% rename from Documentation/DocBook/v4l/common.xml rename to Documentation/DocBook/media/v4l/common.xml diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml similarity index 100% rename from Documentation/DocBook/v4l/compat.xml rename to Documentation/DocBook/media/v4l/compat.xml diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml similarity index 100% rename from Documentation/DocBook/v4l/controls.xml rename to Documentation/DocBook/media/v4l/controls.xml diff --git a/Documentation/DocBook/v4l/crop.gif b/Documentation/DocBook/media/v4l/crop.gif similarity index 100% rename from Documentation/DocBook/v4l/crop.gif rename to Documentation/DocBook/media/v4l/crop.gif diff --git a/Documentation/DocBook/v4l/crop.pdf b/Documentation/DocBook/media/v4l/crop.pdf similarity index 100% rename from Documentation/DocBook/v4l/crop.pdf rename to Documentation/DocBook/media/v4l/crop.pdf diff --git a/Documentation/DocBook/v4l/dev-capture.xml b/Documentation/DocBook/media/v4l/dev-capture.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-capture.xml rename to Documentation/DocBook/media/v4l/dev-capture.xml diff --git a/Documentation/DocBook/v4l/dev-codec.xml b/Documentation/DocBook/media/v4l/dev-codec.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-codec.xml rename to Documentation/DocBook/media/v4l/dev-codec.xml diff --git a/Documentation/DocBook/v4l/dev-effect.xml b/Documentation/DocBook/media/v4l/dev-effect.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-effect.xml rename to Documentation/DocBook/media/v4l/dev-effect.xml diff --git a/Documentation/DocBook/v4l/dev-event.xml b/Documentation/DocBook/media/v4l/dev-event.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-event.xml rename to Documentation/DocBook/media/v4l/dev-event.xml diff --git a/Documentation/DocBook/v4l/dev-osd.xml b/Documentation/DocBook/media/v4l/dev-osd.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-osd.xml rename to Documentation/DocBook/media/v4l/dev-osd.xml diff --git a/Documentation/DocBook/v4l/dev-output.xml b/Documentation/DocBook/media/v4l/dev-output.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-output.xml rename to Documentation/DocBook/media/v4l/dev-output.xml diff --git a/Documentation/DocBook/v4l/dev-overlay.xml b/Documentation/DocBook/media/v4l/dev-overlay.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-overlay.xml rename to Documentation/DocBook/media/v4l/dev-overlay.xml diff --git a/Documentation/DocBook/v4l/dev-radio.xml b/Documentation/DocBook/media/v4l/dev-radio.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-radio.xml rename to Documentation/DocBook/media/v4l/dev-radio.xml diff --git a/Documentation/DocBook/v4l/dev-raw-vbi.xml b/Documentation/DocBook/media/v4l/dev-raw-vbi.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-raw-vbi.xml rename to Documentation/DocBook/media/v4l/dev-raw-vbi.xml diff --git a/Documentation/DocBook/v4l/dev-rds.xml b/Documentation/DocBook/media/v4l/dev-rds.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-rds.xml rename to Documentation/DocBook/media/v4l/dev-rds.xml diff --git a/Documentation/DocBook/v4l/dev-sliced-vbi.xml b/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-sliced-vbi.xml rename to Documentation/DocBook/media/v4l/dev-sliced-vbi.xml diff --git a/Documentation/DocBook/v4l/dev-subdev.xml b/Documentation/DocBook/media/v4l/dev-subdev.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-subdev.xml rename to Documentation/DocBook/media/v4l/dev-subdev.xml diff --git a/Documentation/DocBook/v4l/dev-teletext.xml b/Documentation/DocBook/media/v4l/dev-teletext.xml similarity index 100% rename from Documentation/DocBook/v4l/dev-teletext.xml rename to Documentation/DocBook/media/v4l/dev-teletext.xml diff --git a/Documentation/DocBook/v4l/driver.xml b/Documentation/DocBook/media/v4l/driver.xml similarity index 100% rename from Documentation/DocBook/v4l/driver.xml rename to Documentation/DocBook/media/v4l/driver.xml diff --git a/Documentation/DocBook/v4l/fdl-appendix.xml b/Documentation/DocBook/media/v4l/fdl-appendix.xml similarity index 100% rename from Documentation/DocBook/v4l/fdl-appendix.xml rename to Documentation/DocBook/media/v4l/fdl-appendix.xml diff --git a/Documentation/DocBook/v4l/fieldseq_bt.gif b/Documentation/DocBook/media/v4l/fieldseq_bt.gif similarity index 100% rename from Documentation/DocBook/v4l/fieldseq_bt.gif rename to Documentation/DocBook/media/v4l/fieldseq_bt.gif diff --git a/Documentation/DocBook/v4l/fieldseq_bt.pdf b/Documentation/DocBook/media/v4l/fieldseq_bt.pdf similarity index 100% rename from Documentation/DocBook/v4l/fieldseq_bt.pdf rename to Documentation/DocBook/media/v4l/fieldseq_bt.pdf diff --git a/Documentation/DocBook/v4l/fieldseq_tb.gif b/Documentation/DocBook/media/v4l/fieldseq_tb.gif similarity index 100% rename from Documentation/DocBook/v4l/fieldseq_tb.gif rename to Documentation/DocBook/media/v4l/fieldseq_tb.gif diff --git a/Documentation/DocBook/v4l/fieldseq_tb.pdf b/Documentation/DocBook/media/v4l/fieldseq_tb.pdf similarity index 100% rename from Documentation/DocBook/v4l/fieldseq_tb.pdf rename to Documentation/DocBook/media/v4l/fieldseq_tb.pdf diff --git a/Documentation/DocBook/v4l/func-close.xml b/Documentation/DocBook/media/v4l/func-close.xml similarity index 100% rename from Documentation/DocBook/v4l/func-close.xml rename to Documentation/DocBook/media/v4l/func-close.xml diff --git a/Documentation/DocBook/v4l/func-ioctl.xml b/Documentation/DocBook/media/v4l/func-ioctl.xml similarity index 100% rename from Documentation/DocBook/v4l/func-ioctl.xml rename to Documentation/DocBook/media/v4l/func-ioctl.xml diff --git a/Documentation/DocBook/v4l/func-mmap.xml b/Documentation/DocBook/media/v4l/func-mmap.xml similarity index 100% rename from Documentation/DocBook/v4l/func-mmap.xml rename to Documentation/DocBook/media/v4l/func-mmap.xml diff --git a/Documentation/DocBook/v4l/func-munmap.xml b/Documentation/DocBook/media/v4l/func-munmap.xml similarity index 100% rename from Documentation/DocBook/v4l/func-munmap.xml rename to Documentation/DocBook/media/v4l/func-munmap.xml diff --git a/Documentation/DocBook/v4l/func-open.xml b/Documentation/DocBook/media/v4l/func-open.xml similarity index 100% rename from Documentation/DocBook/v4l/func-open.xml rename to Documentation/DocBook/media/v4l/func-open.xml diff --git a/Documentation/DocBook/v4l/func-poll.xml b/Documentation/DocBook/media/v4l/func-poll.xml similarity index 100% rename from Documentation/DocBook/v4l/func-poll.xml rename to Documentation/DocBook/media/v4l/func-poll.xml diff --git a/Documentation/DocBook/v4l/func-read.xml b/Documentation/DocBook/media/v4l/func-read.xml similarity index 100% rename from Documentation/DocBook/v4l/func-read.xml rename to Documentation/DocBook/media/v4l/func-read.xml diff --git a/Documentation/DocBook/v4l/func-select.xml b/Documentation/DocBook/media/v4l/func-select.xml similarity index 100% rename from Documentation/DocBook/v4l/func-select.xml rename to Documentation/DocBook/media/v4l/func-select.xml diff --git a/Documentation/DocBook/v4l/func-write.xml b/Documentation/DocBook/media/v4l/func-write.xml similarity index 100% rename from Documentation/DocBook/v4l/func-write.xml rename to Documentation/DocBook/media/v4l/func-write.xml diff --git a/Documentation/DocBook/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml similarity index 100% rename from Documentation/DocBook/v4l/io.xml rename to Documentation/DocBook/media/v4l/io.xml diff --git a/Documentation/DocBook/v4l/keytable.c.xml b/Documentation/DocBook/media/v4l/keytable.c.xml similarity index 100% rename from Documentation/DocBook/v4l/keytable.c.xml rename to Documentation/DocBook/media/v4l/keytable.c.xml diff --git a/Documentation/DocBook/v4l/libv4l.xml b/Documentation/DocBook/media/v4l/libv4l.xml similarity index 100% rename from Documentation/DocBook/v4l/libv4l.xml rename to Documentation/DocBook/media/v4l/libv4l.xml diff --git a/Documentation/DocBook/v4l/lirc_device_interface.xml b/Documentation/DocBook/media/v4l/lirc_device_interface.xml similarity index 100% rename from Documentation/DocBook/v4l/lirc_device_interface.xml rename to Documentation/DocBook/media/v4l/lirc_device_interface.xml diff --git a/Documentation/DocBook/v4l/media-controller.xml b/Documentation/DocBook/media/v4l/media-controller.xml similarity index 100% rename from Documentation/DocBook/v4l/media-controller.xml rename to Documentation/DocBook/media/v4l/media-controller.xml diff --git a/Documentation/DocBook/v4l/media-func-close.xml b/Documentation/DocBook/media/v4l/media-func-close.xml similarity index 100% rename from Documentation/DocBook/v4l/media-func-close.xml rename to Documentation/DocBook/media/v4l/media-func-close.xml diff --git a/Documentation/DocBook/v4l/media-func-ioctl.xml b/Documentation/DocBook/media/v4l/media-func-ioctl.xml similarity index 100% rename from Documentation/DocBook/v4l/media-func-ioctl.xml rename to Documentation/DocBook/media/v4l/media-func-ioctl.xml diff --git a/Documentation/DocBook/v4l/media-func-open.xml b/Documentation/DocBook/media/v4l/media-func-open.xml similarity index 100% rename from Documentation/DocBook/v4l/media-func-open.xml rename to Documentation/DocBook/media/v4l/media-func-open.xml diff --git a/Documentation/DocBook/v4l/media-ioc-device-info.xml b/Documentation/DocBook/media/v4l/media-ioc-device-info.xml similarity index 100% rename from Documentation/DocBook/v4l/media-ioc-device-info.xml rename to Documentation/DocBook/media/v4l/media-ioc-device-info.xml diff --git a/Documentation/DocBook/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml similarity index 100% rename from Documentation/DocBook/v4l/media-ioc-enum-entities.xml rename to Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml diff --git a/Documentation/DocBook/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml similarity index 100% rename from Documentation/DocBook/v4l/media-ioc-enum-links.xml rename to Documentation/DocBook/media/v4l/media-ioc-enum-links.xml diff --git a/Documentation/DocBook/v4l/media-ioc-setup-link.xml b/Documentation/DocBook/media/v4l/media-ioc-setup-link.xml similarity index 100% rename from Documentation/DocBook/v4l/media-ioc-setup-link.xml rename to Documentation/DocBook/media/v4l/media-ioc-setup-link.xml diff --git a/Documentation/DocBook/v4l/nv12mt.gif b/Documentation/DocBook/media/v4l/nv12mt.gif similarity index 100% rename from Documentation/DocBook/v4l/nv12mt.gif rename to Documentation/DocBook/media/v4l/nv12mt.gif diff --git a/Documentation/DocBook/v4l/nv12mt_example.gif b/Documentation/DocBook/media/v4l/nv12mt_example.gif similarity index 100% rename from Documentation/DocBook/v4l/nv12mt_example.gif rename to Documentation/DocBook/media/v4l/nv12mt_example.gif diff --git a/Documentation/DocBook/v4l/pipeline.pdf b/Documentation/DocBook/media/v4l/pipeline.pdf similarity index 100% rename from Documentation/DocBook/v4l/pipeline.pdf rename to Documentation/DocBook/media/v4l/pipeline.pdf diff --git a/Documentation/DocBook/v4l/pipeline.png b/Documentation/DocBook/media/v4l/pipeline.png similarity index 100% rename from Documentation/DocBook/v4l/pipeline.png rename to Documentation/DocBook/media/v4l/pipeline.png diff --git a/Documentation/DocBook/v4l/pixfmt-grey.xml b/Documentation/DocBook/media/v4l/pixfmt-grey.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-grey.xml rename to Documentation/DocBook/media/v4l/pixfmt-grey.xml diff --git a/Documentation/DocBook/v4l/pixfmt-m420.xml b/Documentation/DocBook/media/v4l/pixfmt-m420.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-m420.xml rename to Documentation/DocBook/media/v4l/pixfmt-m420.xml diff --git a/Documentation/DocBook/v4l/pixfmt-nv12.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-nv12.xml rename to Documentation/DocBook/media/v4l/pixfmt-nv12.xml diff --git a/Documentation/DocBook/v4l/pixfmt-nv12m.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-nv12m.xml rename to Documentation/DocBook/media/v4l/pixfmt-nv12m.xml diff --git a/Documentation/DocBook/v4l/pixfmt-nv12mt.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-nv12mt.xml rename to Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml diff --git a/Documentation/DocBook/v4l/pixfmt-nv16.xml b/Documentation/DocBook/media/v4l/pixfmt-nv16.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-nv16.xml rename to Documentation/DocBook/media/v4l/pixfmt-nv16.xml diff --git a/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-packed-rgb.xml rename to Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml diff --git a/Documentation/DocBook/v4l/pixfmt-packed-yuv.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-packed-yuv.xml rename to Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml diff --git a/Documentation/DocBook/v4l/pixfmt-sbggr16.xml b/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-sbggr16.xml rename to Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml diff --git a/Documentation/DocBook/v4l/pixfmt-sbggr8.xml b/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-sbggr8.xml rename to Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml diff --git a/Documentation/DocBook/v4l/pixfmt-sgbrg8.xml b/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-sgbrg8.xml rename to Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml diff --git a/Documentation/DocBook/v4l/pixfmt-sgrbg8.xml b/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-sgrbg8.xml rename to Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml diff --git a/Documentation/DocBook/v4l/pixfmt-srggb10.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-srggb10.xml rename to Documentation/DocBook/media/v4l/pixfmt-srggb10.xml diff --git a/Documentation/DocBook/v4l/pixfmt-srggb12.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb12.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-srggb12.xml rename to Documentation/DocBook/media/v4l/pixfmt-srggb12.xml diff --git a/Documentation/DocBook/v4l/pixfmt-srggb8.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb8.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-srggb8.xml rename to Documentation/DocBook/media/v4l/pixfmt-srggb8.xml diff --git a/Documentation/DocBook/v4l/pixfmt-uyvy.xml b/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-uyvy.xml rename to Documentation/DocBook/media/v4l/pixfmt-uyvy.xml diff --git a/Documentation/DocBook/v4l/pixfmt-vyuy.xml b/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-vyuy.xml rename to Documentation/DocBook/media/v4l/pixfmt-vyuy.xml diff --git a/Documentation/DocBook/v4l/pixfmt-y10.xml b/Documentation/DocBook/media/v4l/pixfmt-y10.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-y10.xml rename to Documentation/DocBook/media/v4l/pixfmt-y10.xml diff --git a/Documentation/DocBook/v4l/pixfmt-y10b.xml b/Documentation/DocBook/media/v4l/pixfmt-y10b.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-y10b.xml rename to Documentation/DocBook/media/v4l/pixfmt-y10b.xml diff --git a/Documentation/DocBook/v4l/pixfmt-y12.xml b/Documentation/DocBook/media/v4l/pixfmt-y12.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-y12.xml rename to Documentation/DocBook/media/v4l/pixfmt-y12.xml diff --git a/Documentation/DocBook/v4l/pixfmt-y16.xml b/Documentation/DocBook/media/v4l/pixfmt-y16.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-y16.xml rename to Documentation/DocBook/media/v4l/pixfmt-y16.xml diff --git a/Documentation/DocBook/v4l/pixfmt-y41p.xml b/Documentation/DocBook/media/v4l/pixfmt-y41p.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-y41p.xml rename to Documentation/DocBook/media/v4l/pixfmt-y41p.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuv410.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuv410.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuv410.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuv411p.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuv411p.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuv420.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuv420.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuv420.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuv420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuv420m.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuv422p.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuv422p.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yuyv.xml b/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yuyv.xml rename to Documentation/DocBook/media/v4l/pixfmt-yuyv.xml diff --git a/Documentation/DocBook/v4l/pixfmt-yvyu.xml b/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt-yvyu.xml rename to Documentation/DocBook/media/v4l/pixfmt-yvyu.xml diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml similarity index 100% rename from Documentation/DocBook/v4l/pixfmt.xml rename to Documentation/DocBook/media/v4l/pixfmt.xml diff --git a/Documentation/DocBook/v4l/planar-apis.xml b/Documentation/DocBook/media/v4l/planar-apis.xml similarity index 100% rename from Documentation/DocBook/v4l/planar-apis.xml rename to Documentation/DocBook/media/v4l/planar-apis.xml diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/media/v4l/remote_controllers.xml similarity index 100% rename from Documentation/DocBook/v4l/remote_controllers.xml rename to Documentation/DocBook/media/v4l/remote_controllers.xml diff --git a/Documentation/DocBook/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml similarity index 100% rename from Documentation/DocBook/v4l/subdev-formats.xml rename to Documentation/DocBook/media/v4l/subdev-formats.xml diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml similarity index 100% rename from Documentation/DocBook/v4l/v4l2.xml rename to Documentation/DocBook/media/v4l/v4l2.xml diff --git a/Documentation/DocBook/v4l/v4l2grab.c.xml b/Documentation/DocBook/media/v4l/v4l2grab.c.xml similarity index 100% rename from Documentation/DocBook/v4l/v4l2grab.c.xml rename to Documentation/DocBook/media/v4l/v4l2grab.c.xml diff --git a/Documentation/DocBook/v4l/vbi_525.gif b/Documentation/DocBook/media/v4l/vbi_525.gif similarity index 100% rename from Documentation/DocBook/v4l/vbi_525.gif rename to Documentation/DocBook/media/v4l/vbi_525.gif diff --git a/Documentation/DocBook/v4l/vbi_525.pdf b/Documentation/DocBook/media/v4l/vbi_525.pdf similarity index 100% rename from Documentation/DocBook/v4l/vbi_525.pdf rename to Documentation/DocBook/media/v4l/vbi_525.pdf diff --git a/Documentation/DocBook/v4l/vbi_625.gif b/Documentation/DocBook/media/v4l/vbi_625.gif similarity index 100% rename from Documentation/DocBook/v4l/vbi_625.gif rename to Documentation/DocBook/media/v4l/vbi_625.gif diff --git a/Documentation/DocBook/v4l/vbi_625.pdf b/Documentation/DocBook/media/v4l/vbi_625.pdf similarity index 100% rename from Documentation/DocBook/v4l/vbi_625.pdf rename to Documentation/DocBook/media/v4l/vbi_625.pdf diff --git a/Documentation/DocBook/v4l/vbi_hsync.gif b/Documentation/DocBook/media/v4l/vbi_hsync.gif similarity index 100% rename from Documentation/DocBook/v4l/vbi_hsync.gif rename to Documentation/DocBook/media/v4l/vbi_hsync.gif diff --git a/Documentation/DocBook/v4l/vbi_hsync.pdf b/Documentation/DocBook/media/v4l/vbi_hsync.pdf similarity index 100% rename from Documentation/DocBook/v4l/vbi_hsync.pdf rename to Documentation/DocBook/media/v4l/vbi_hsync.pdf diff --git a/Documentation/DocBook/v4l/vidioc-cropcap.xml b/Documentation/DocBook/media/v4l/vidioc-cropcap.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-cropcap.xml rename to Documentation/DocBook/media/v4l/vidioc-cropcap.xml diff --git a/Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml rename to Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml diff --git a/Documentation/DocBook/v4l/vidioc-dbg-g-register.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-dbg-g-register.xml rename to Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml diff --git a/Documentation/DocBook/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-dqevent.xml rename to Documentation/DocBook/media/v4l/vidioc-dqevent.xml diff --git a/Documentation/DocBook/v4l/vidioc-encoder-cmd.xml b/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-encoder-cmd.xml rename to Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml diff --git a/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml rename to Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml diff --git a/Documentation/DocBook/v4l/vidioc-enum-fmt.xml b/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enum-fmt.xml rename to Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml diff --git a/Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml b/Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml rename to Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml diff --git a/Documentation/DocBook/v4l/vidioc-enum-framesizes.xml b/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enum-framesizes.xml rename to Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml diff --git a/Documentation/DocBook/v4l/vidioc-enumaudio.xml b/Documentation/DocBook/media/v4l/vidioc-enumaudio.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enumaudio.xml rename to Documentation/DocBook/media/v4l/vidioc-enumaudio.xml diff --git a/Documentation/DocBook/v4l/vidioc-enumaudioout.xml b/Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enumaudioout.xml rename to Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml diff --git a/Documentation/DocBook/v4l/vidioc-enuminput.xml b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enuminput.xml rename to Documentation/DocBook/media/v4l/vidioc-enuminput.xml diff --git a/Documentation/DocBook/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enumoutput.xml rename to Documentation/DocBook/media/v4l/vidioc-enumoutput.xml diff --git a/Documentation/DocBook/v4l/vidioc-enumstd.xml b/Documentation/DocBook/media/v4l/vidioc-enumstd.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-enumstd.xml rename to Documentation/DocBook/media/v4l/vidioc-enumstd.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-audio.xml b/Documentation/DocBook/media/v4l/vidioc-g-audio.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-audio.xml rename to Documentation/DocBook/media/v4l/vidioc-g-audio.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-audioout.xml b/Documentation/DocBook/media/v4l/vidioc-g-audioout.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-audioout.xml rename to Documentation/DocBook/media/v4l/vidioc-g-audioout.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-crop.xml b/Documentation/DocBook/media/v4l/vidioc-g-crop.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-crop.xml rename to Documentation/DocBook/media/v4l/vidioc-g-crop.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-ctrl.xml b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-ctrl.xml rename to Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-dv-preset.xml rename to Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-dv-timings.xml rename to Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-enc-index.xml b/Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-enc-index.xml rename to Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml rename to Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-fbuf.xml b/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-fbuf.xml rename to Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-fmt.xml b/Documentation/DocBook/media/v4l/vidioc-g-fmt.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-fmt.xml rename to Documentation/DocBook/media/v4l/vidioc-g-fmt.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-frequency.xml rename to Documentation/DocBook/media/v4l/vidioc-g-frequency.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-input.xml b/Documentation/DocBook/media/v4l/vidioc-g-input.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-input.xml rename to Documentation/DocBook/media/v4l/vidioc-g-input.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml b/Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml rename to Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-modulator.xml b/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-modulator.xml rename to Documentation/DocBook/media/v4l/vidioc-g-modulator.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-output.xml b/Documentation/DocBook/media/v4l/vidioc-g-output.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-output.xml rename to Documentation/DocBook/media/v4l/vidioc-g-output.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-parm.xml b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-parm.xml rename to Documentation/DocBook/media/v4l/vidioc-g-parm.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-priority.xml b/Documentation/DocBook/media/v4l/vidioc-g-priority.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-priority.xml rename to Documentation/DocBook/media/v4l/vidioc-g-priority.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml b/Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml rename to Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-std.xml b/Documentation/DocBook/media/v4l/vidioc-g-std.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-std.xml rename to Documentation/DocBook/media/v4l/vidioc-g-std.xml diff --git a/Documentation/DocBook/v4l/vidioc-g-tuner.xml b/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-g-tuner.xml rename to Documentation/DocBook/media/v4l/vidioc-g-tuner.xml diff --git a/Documentation/DocBook/v4l/vidioc-log-status.xml b/Documentation/DocBook/media/v4l/vidioc-log-status.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-log-status.xml rename to Documentation/DocBook/media/v4l/vidioc-log-status.xml diff --git a/Documentation/DocBook/v4l/vidioc-overlay.xml b/Documentation/DocBook/media/v4l/vidioc-overlay.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-overlay.xml rename to Documentation/DocBook/media/v4l/vidioc-overlay.xml diff --git a/Documentation/DocBook/v4l/vidioc-qbuf.xml b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-qbuf.xml rename to Documentation/DocBook/media/v4l/vidioc-qbuf.xml diff --git a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-query-dv-preset.xml rename to Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml diff --git a/Documentation/DocBook/v4l/vidioc-querybuf.xml b/Documentation/DocBook/media/v4l/vidioc-querybuf.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-querybuf.xml rename to Documentation/DocBook/media/v4l/vidioc-querybuf.xml diff --git a/Documentation/DocBook/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-querycap.xml rename to Documentation/DocBook/media/v4l/vidioc-querycap.xml diff --git a/Documentation/DocBook/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-queryctrl.xml rename to Documentation/DocBook/media/v4l/vidioc-queryctrl.xml diff --git a/Documentation/DocBook/v4l/vidioc-querystd.xml b/Documentation/DocBook/media/v4l/vidioc-querystd.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-querystd.xml rename to Documentation/DocBook/media/v4l/vidioc-querystd.xml diff --git a/Documentation/DocBook/v4l/vidioc-reqbufs.xml b/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-reqbufs.xml rename to Documentation/DocBook/media/v4l/vidioc-reqbufs.xml diff --git a/Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml rename to Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml diff --git a/Documentation/DocBook/v4l/vidioc-streamon.xml b/Documentation/DocBook/media/v4l/vidioc-streamon.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-streamon.xml rename to Documentation/DocBook/media/v4l/vidioc-streamon.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-enum-frame-interval.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-enum-frame-interval.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-enum-frame-size.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-enum-frame-size.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-enum-mbus-code.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-enum-mbus-code.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-g-crop.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-g-crop.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-g-fmt.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-g-fmt.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml diff --git a/Documentation/DocBook/v4l/vidioc-subdev-g-frame-interval.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-g-frame-interval.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subdev-g-frame-interval.xml rename to Documentation/DocBook/media/v4l/vidioc-subdev-g-frame-interval.xml diff --git a/Documentation/DocBook/v4l/vidioc-subscribe-event.xml b/Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml similarity index 100% rename from Documentation/DocBook/v4l/vidioc-subscribe-event.xml rename to Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml diff --git a/Documentation/DocBook/media.tmpl b/Documentation/DocBook/media_api.tmpl similarity index 100% rename from Documentation/DocBook/media.tmpl rename to Documentation/DocBook/media_api.tmpl