Commit fb091be0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
  V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
  V4L/DVB: vivi and mem2mem_testdev need slab.h to build
  V4L/DVB: tm6000: bugfix image position
  V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
  V4L/DVB: tm6000: README - add vbi
  V4L/DVB: Fix unlock logic at medusa_video_init
  V4L/DVB: fix dvb frontend lockup
  V4L/DVB: s2255drv: remove dead code
  V4L/DVB: s2255drv: return if vdev not found
  V4L/DVB: ov511: cleanup: remove unneeded null check
  V4L/DVB: media/mem2mem: dereferencing free memory
  V4L/DVB: media/IR: Add missing include file to rc-map.c
  V4L/DVB: dvb/stv6110x: cleanup error handling
  V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
  V4L/DVB: ngene: start separating out DVB functions into separate file
  V4L/DVB: ngene: split out card specific code into a separate file
  V4L/DVB: ngene: split out i2c code into a separate file
  V4L/DVB: ngene: add initial support for digital side of Avermedia m780
  V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
  V4L-DVB: ngene: make sure that tuner headers are included
  ...
parents bd7fc2f2 e8d04167

Documentation/DocBook/media-entities.tmpl

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<!ENTITY VIDIOC-DBG-G-REGISTER "<link linkend='vidioc-dbg-g-register'><constant>VIDIOC_DBG_G_REGISTER</constant></link>">

<!ENTITY VIDIOC-DBG-S-REGISTER "<link linkend='vidioc-dbg-g-register'><constant>VIDIOC_DBG_S_REGISTER</constant></link>">

<!ENTITY VIDIOC-DQBUF "<link linkend='vidioc-qbuf'><constant>VIDIOC_DQBUF</constant></link>">

<!ENTITY VIDIOC-DQEVENT "<link linkend='vidioc-dqevent'><constant>VIDIOC_DQEVENT</constant></link>">

<!ENTITY VIDIOC-ENCODER-CMD "<link linkend='vidioc-encoder-cmd'><constant>VIDIOC_ENCODER_CMD</constant></link>">

<!ENTITY VIDIOC-ENUMAUDIO "<link linkend='vidioc-enumaudio'><constant>VIDIOC_ENUMAUDIO</constant></link>">

<!ENTITY VIDIOC-ENUMAUDOUT "<link linkend='vidioc-enumaudioout'><constant>VIDIOC_ENUMAUDOUT</constant></link>">
@@ -60,6 +61,7 @@ 
<!ENTITY VIDIOC-REQBUFS "<link linkend='vidioc-reqbufs'><constant>VIDIOC_REQBUFS</constant></link>">

<!ENTITY VIDIOC-STREAMOFF "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMOFF</constant></link>">

<!ENTITY VIDIOC-STREAMON "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMON</constant></link>">

<!ENTITY VIDIOC-SUBSCRIBE-EVENT "<link linkend='vidioc-subscribe-event'><constant>VIDIOC_SUBSCRIBE_EVENT</constant></link>">

<!ENTITY VIDIOC-S-AUDIO "<link linkend='vidioc-g-audio'><constant>VIDIOC_S_AUDIO</constant></link>">

<!ENTITY VIDIOC-S-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_S_AUDOUT</constant></link>">

<!ENTITY VIDIOC-S-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_S_CROP</constant></link>">
@@ -83,6 +85,7 @@ 
<!ENTITY VIDIOC-TRY-ENCODER-CMD "<link linkend='vidioc-encoder-cmd'><constant>VIDIOC_TRY_ENCODER_CMD</constant></link>">

<!ENTITY VIDIOC-TRY-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_TRY_EXT_CTRLS</constant></link>">

<!ENTITY VIDIOC-TRY-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>">

<!ENTITY VIDIOC-UNSUBSCRIBE-EVENT "<link linkend='vidioc-subscribe-event'><constant>VIDIOC_UNSUBSCRIBE_EVENT</constant></link>">



<!-- Types -->

<!ENTITY v4l2-std-id "<link linkend='v4l2-std-id'>v4l2_std_id</link>">
@@ -141,6 +144,9 @@ 
<!ENTITY v4l2-enc-idx "struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link>">

<!ENTITY v4l2-enc-idx-entry "struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link>">

<!ENTITY v4l2-encoder-cmd "struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link>">

<!ENTITY v4l2-event "struct&nbsp;<link linkend='v4l2-event'>v4l2_event</link>">

<!ENTITY v4l2-event-subscription "struct&nbsp;<link linkend='v4l2-event-subscription'>v4l2_event_subscription</link>">

<!ENTITY v4l2-event-vsync "struct&nbsp;<link linkend='v4l2-event-vsync'>v4l2_event_vsync</link>">

<!ENTITY v4l2-ext-control "struct&nbsp;<link linkend='v4l2-ext-control'>v4l2_ext_control</link>">

<!ENTITY v4l2-ext-controls "struct&nbsp;<link linkend='v4l2-ext-controls'>v4l2_ext_controls</link>">

<!ENTITY v4l2-fmtdesc "struct&nbsp;<link linkend='v4l2-fmtdesc'>v4l2_fmtdesc</link>">
@@ -200,6 +206,7 @@ 
<!ENTITY sub-controls SYSTEM "v4l/controls.xml">

<!ENTITY sub-dev-capture SYSTEM "v4l/dev-capture.xml">

<!ENTITY sub-dev-codec SYSTEM "v4l/dev-codec.xml">

<!ENTITY sub-dev-event SYSTEM "v4l/dev-event.xml">

<!ENTITY sub-dev-effect SYSTEM "v4l/dev-effect.xml">

<!ENTITY sub-dev-osd SYSTEM "v4l/dev-osd.xml">

<!ENTITY sub-dev-output SYSTEM "v4l/dev-output.xml">
@@ -292,6 +299,8 @@ 
<!ENTITY sub-v4l2grab-c SYSTEM "v4l/v4l2grab.c.xml">

<!ENTITY sub-videodev2-h SYSTEM "v4l/videodev2.h.xml">

<!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml">

<!ENTITY sub-dqevent SYSTEM "v4l/vidioc-dqevent.xml">

<!ENTITY sub-subscribe-event SYSTEM "v4l/vidioc-subscribe-event.xml">

<!ENTITY sub-intro SYSTEM "dvb/intro.xml">

<!ENTITY sub-frontend SYSTEM "dvb/frontend.xml">

<!ENTITY sub-dvbproperty SYSTEM "dvb/dvbproperty.xml">
@@ -381,3 +390,5 @@ 
<!ENTITY reqbufs SYSTEM "v4l/vidioc-reqbufs.xml">

<!ENTITY s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml">

<!ENTITY streamon SYSTEM "v4l/vidioc-streamon.xml">

<!ENTITY dqevent SYSTEM "v4l/vidioc-dqevent.xml">

<!ENTITY subscribe_event SYSTEM "v4l/vidioc-subscribe-event.xml">

Documentation/DocBook/v4l/compat.xml

+69 −57
Original line number Diff line number Diff line
@@ -2332,6 +2332,17 @@ more information.</para> 
	</listitem>

      </orderedlist>

    </section>

    <section>

      <title>V4L2 in Linux 2.6.34</title>

      <orderedlist>

	<listitem>

	  <para>Added

<constant>V4L2_CID_IRIS_ABSOLUTE</constant> and

<constant>V4L2_CID_IRIS_RELATIVE</constant> controls to the

	    <link linkend="camera-controls">Camera controls class</link>.

	  </para>

	</listitem>

      </orderedlist>

    </section>



    <section id="other">
@@ -2455,6 +2466,7 @@ interfaces and should not be implemented in new drivers.</para> 
        </listitem>

      </itemizedlist>

    </section>

  </section>



  <!--

Local Variables:

Documentation/DocBook/v4l/controls.xml

+34 −2
Original line number Diff line number Diff line
@@ -266,6 +266,12 @@ minimum value disables backlight compensation.</entry> 
	    <entry>boolean</entry>

	    <entry>Chroma automatic gain control.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_CHROMA_GAIN</constant></entry>

	    <entry>integer</entry>

	    <entry>Adjusts the Chroma gain control (for use when chroma AGC

	    is disabled).</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry>

	    <entry>boolean</entry>
@@ -277,8 +283,15 @@ minimum value disables backlight compensation.</entry> 
	    <entry>Selects a color effect. Possible values for

<constant>enum v4l2_colorfx</constant> are:

<constant>V4L2_COLORFX_NONE</constant> (0),

<constant>V4L2_COLORFX_BW</constant> (1) and

<constant>V4L2_COLORFX_SEPIA</constant> (2).</entry>

<constant>V4L2_COLORFX_BW</constant> (1),

<constant>V4L2_COLORFX_SEPIA</constant> (2),

<constant>V4L2_COLORFX_NEGATIVE</constant> (3),

<constant>V4L2_COLORFX_EMBOSS</constant> (4),

<constant>V4L2_COLORFX_SKETCH</constant> (5),

<constant>V4L2_COLORFX_SKY_BLUE</constant> (6),

<constant>V4L2_COLORFX_GRASS_GREEN</constant> (7),

<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8) and

<constant>V4L2_COLORFX_VIVID</constant> (9).</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_ROTATE</constant></entry>
@@ -1824,6 +1837,25 @@ wide-angle direction. The zoom speed unit is driver-specific.</entry> 
	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_IRIS_ABSOLUTE</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control sets the

camera's aperture to the specified value. The unit is undefined.

Larger values open the iris wider, smaller values close it.</entry>

	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_IRIS_RELATIVE</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control modifies the

camera's aperture by the specified amount. The unit is undefined.

Positive values open the iris one step further, negative values close

it one step further. This is a write-only control.</entry>

	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_PRIVACY</constant>&nbsp;</entry>

	    <entry>boolean</entry>

Documentation/DocBook/v4l/dev-event.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
  <title>Event Interface</title>



  <para>The V4L2 event interface provides means for user to get

  immediately notified on certain conditions taking place on a device.

  This might include start of frame or loss of signal events, for

  example.

  </para>



  <para>To receive events, the events the user is interested in first must

  be subscribed using the &VIDIOC-SUBSCRIBE-EVENT; ioctl. Once an event is

  subscribed, the events of subscribed types are dequeueable using the

  &VIDIOC-DQEVENT; ioctl. Events may be unsubscribed using

  VIDIOC_UNSUBSCRIBE_EVENT ioctl. The special event type V4L2_EVENT_ALL may

  be used to unsubscribe all the events the driver supports.</para>



  <para>The event subscriptions and event queues are specific to file

  handles. Subscribing an event on one file handle does not affect

  other file handles.

  </para>



  <para>The information on dequeueable events is obtained by using select or

  poll system calls on video devices. The V4L2 events use POLLPRI events on

  poll system call and exceptions on select system call.  </para>



  <!--

Local Variables:

mode: sgml

sgml-parent-document: "v4l2.sgml"

indent-tabs-mode: nil

End:

  -->

Documentation/DocBook/v4l/io.xml

+14 −4
Original line number Diff line number Diff line
@@ -701,6 +701,16 @@ buffer cannot be on both queues at the same time, the 
They can be both cleared however, then the buffer is in "dequeued"

state, in the application domain to say so.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_BUF_FLAG_ERROR</constant></entry>

	    <entry>0x0040</entry>

	    <entry>When this flag is set, the buffer has been dequeued

	    successfully, although the data might have been corrupted.

	    This is recoverable, streaming may continue as normal and

	    the buffer may be reused normally.

	    Drivers set this flag when the <constant>VIDIOC_DQBUF</constant>

	    ioctl is called.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_BUF_FLAG_KEYFRAME</constant></entry>

	    <entry>0x0008</entry>
@@ -918,8 +928,8 @@ order</emphasis>.</para> 


    <para>When the driver provides or accepts images field by field

rather than interleaved, it is also important applications understand

how the fields combine to frames. We distinguish between top and

bottom fields, the <emphasis>spatial order</emphasis>: The first line

how the fields combine to frames. We distinguish between top (aka odd) and

bottom (aka even) fields, the <emphasis>spatial order</emphasis>: The first line

of the top field is the first line of an interlaced frame, the first

line of the bottom field is the second line of that frame.</para>
@@ -972,12 +982,12 @@ between <constant>V4L2_FIELD_TOP</constant> and 
	  <row>

	    <entry><constant>V4L2_FIELD_TOP</constant></entry>

	    <entry>2</entry>

	    <entry>Images consist of the top field only.</entry>

	    <entry>Images consist of the top (aka odd) field only.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_FIELD_BOTTOM</constant></entry>

	    <entry>3</entry>

	    <entry>Images consist of the bottom field only.

	    <entry>Images consist of the bottom (aka even) field only.

Applications may wish to prevent a device from capturing interlaced

images because they will have "comb" or "feathering" artefacts around

moving objects.</entry>

CRA Git | Maintained and supported by SUSTech CRA and CCSE