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

Merge branch 'v4l_for_linus' of... 

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into next

Pull media updates from Mauro Carvalho Chehab:
 "This contains:
   - a new frontend/tuner driver set for si2168 and sa2157
   - Videobuf 2 core now supports DVB too
   - A new gspca sub-driver (dtcs033)
   - saa7134 is now converted to use videobuf2
   - add support for 4K timings
   - several other driver fixes and improvements

  PS.  This pull request is shorter than usual, partly because I have
  some other patches on topic branches that I'll be sending you later
  this week"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (286 commits)
  [media] au0828-dvb: restore its permission to 644
  [media] xc5000: delay tuner sleep to 5 seconds
  [media] xc5000: Don't use whitespace before tabs
  [media] xc5000: fix CamelCase
  [media] xc5000: Don't wrap msleep()
  [media] xc5000: get rid of positive error codes
  [media] au0828: reset streaming when a new frequency is set
  [media] au0828: Improve debug messages for urb_completion
  [media] au0828: Cancel stream-restart operation if frontend is disconnected
  [media] dib0700: fix RC support on Hauppauge Nova-TD
  [media] USB: as102_usb_drv.c: Remove useless return variables
  [media] v4l: Fix documentation of V4L2_PIX_FMT_H264_MVC and VP8 pixel formats
  [media] m5mols: Replace missing header
  [media] staging: lirc: Fix sparse warnings
  [media] fix mceusb endpoint type identification/handling
  [media] az6027: Added the PID for a new revision of the Elgato EyeTV Sat DVB-S Tuner
  [media] DocBook media: fix typo
  [media] adv7604: Add missing include to linux/types.h
  [media] v4l: Validate fields in the core code for subdev EDID ioctls
  [media] v4l: Add support for DV timings ioctls on subdev nodes
  ...
parents d2705064 a2668e10

Documentation/DocBook/media/v4l/io.xml

+12 −3
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ location of the buffers in device memory can be determined with the 
<structfield>m.offset</structfield> and <structfield>length</structfield>

<structfield>m.offset</structfield> and <structfield>length</structfield>

returned in a &v4l2-buffer; are passed as sixth and second parameter to the

returned in a &v4l2-buffer; are passed as sixth and second parameter to the

<function>mmap()</function> function. When using the multi-planar API,

<function>mmap()</function> function. When using the multi-planar API,

struct &v4l2-buffer; contains an array of &v4l2-plane; structures, each

&v4l2-buffer; contains an array of &v4l2-plane; structures, each

containing its own <structfield>m.offset</structfield> and

containing its own <structfield>m.offset</structfield> and

<structfield>length</structfield>. When using the multi-planar API, every

<structfield>length</structfield>. When using the multi-planar API, every

plane of every buffer has to be mapped separately, so the number of

plane of every buffer has to be mapped separately, so the number of
@@ -699,7 +699,12 @@ linkend="v4l2-buf-type" /></entry> 
buffer. It depends on the negotiated data format and may change with

buffer. It depends on the negotiated data format and may change with

each buffer for compressed variable size data like JPEG images.

each buffer for compressed variable size data like JPEG images.

Drivers must set this field when <structfield>type</structfield>

Drivers must set this field when <structfield>type</structfield>

refers to an input stream, applications when it refers to an output stream.</entry>

refers to an input stream, applications when it refers to an output stream.

If the application sets this to 0 for an output stream, then

<structfield>bytesused</structfield> will be set to the size of the

buffer (see the <structfield>length</structfield> field of this struct) by

the driver. For multiplanar formats this field is ignored and the

<structfield>planes</structfield> pointer is used instead.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>__u32</entry>

	    <entry>__u32</entry>
@@ -861,7 +866,11 @@ should set this to 0.</entry> 
	    <entry></entry>

	    <entry></entry>

	    <entry>The number of bytes occupied by data in the plane

	    <entry>The number of bytes occupied by data in the plane

	      (its payload). Drivers must set this field when <structfield>type</structfield>

	      (its payload). Drivers must set this field when <structfield>type</structfield>

	      refers to an input stream, applications when it refers to an output stream.</entry>

	      refers to an input stream, applications when it refers to an output stream.

	      If the application sets this to 0 for an output stream, then

	      <structfield>bytesused</structfield> will be set to the size of the

	      plane (see the <structfield>length</structfield> field of this struct)

	      by the driver.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>__u32</entry>

	    <entry>__u32</entry>

Documentation/DocBook/media/v4l/media-ioc-enum-links.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -79,13 +79,13 @@ 
	    <entry>Entity id, set by the application.</entry>

	    <entry>Entity id, set by the application.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>struct &media-pad-desc;</entry>

	    <entry>&media-pad-desc;</entry>

	    <entry>*<structfield>pads</structfield></entry>

	    <entry>*<structfield>pads</structfield></entry>

	    <entry>Pointer to a pads array allocated by the application. Ignored

	    <entry>Pointer to a pads array allocated by the application. Ignored

	    if NULL.</entry>

	    if NULL.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>struct &media-link-desc;</entry>

	    <entry>&media-link-desc;</entry>

	    <entry>*<structfield>links</structfield></entry>

	    <entry>*<structfield>links</structfield></entry>

	    <entry>Pointer to a links array allocated by the application. Ignored

	    <entry>Pointer to a links array allocated by the application. Ignored

	    if NULL.</entry>

	    if NULL.</entry>
@@ -153,12 +153,12 @@ 
        &cs-str;

        &cs-str;

	<tbody valign="top">

	<tbody valign="top">

	  <row>

	  <row>

	    <entry>struct &media-pad-desc;</entry>

	    <entry>&media-pad-desc;</entry>

	    <entry><structfield>source</structfield></entry>

	    <entry><structfield>source</structfield></entry>

	    <entry>Pad at the origin of this link.</entry>

	    <entry>Pad at the origin of this link.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>struct &media-pad-desc;</entry>

	    <entry>&media-pad-desc;</entry>

	    <entry><structfield>sink</structfield></entry>

	    <entry><structfield>sink</structfield></entry>

	    <entry>Pad at the target of this link.</entry>

	    <entry>Pad at the target of this link.</entry>

	  </row>

	  </row>

Documentation/DocBook/media/v4l/pixfmt.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -772,7 +772,7 @@ extended control <constant>V4L2_CID_MPEG_STREAM_TYPE</constant>, see 
	  </row>

	  </row>

	  <row id="V4L2-PIX-FMT-H264-MVC">

	  <row id="V4L2-PIX-FMT-H264-MVC">

		<entry><constant>V4L2_PIX_FMT_H264_MVC</constant></entry>

		<entry><constant>V4L2_PIX_FMT_H264_MVC</constant></entry>

		<entry>'MVC'</entry>

		<entry>'M264'</entry>

		<entry>H264 MVC video elementary stream.</entry>

		<entry>H264 MVC video elementary stream.</entry>

	  </row>

	  </row>

	  <row id="V4L2-PIX-FMT-H263">

	  <row id="V4L2-PIX-FMT-H263">
@@ -812,7 +812,7 @@ extended control <constant>V4L2_CID_MPEG_STREAM_TYPE</constant>, see 
	  </row>

	  </row>

	  <row id="V4L2-PIX-FMT-VP8">

	  <row id="V4L2-PIX-FMT-VP8">

		<entry><constant>V4L2_PIX_FMT_VP8</constant></entry>

		<entry><constant>V4L2_PIX_FMT_VP8</constant></entry>

		<entry>'VP8'</entry>

		<entry>'VP80'</entry>

		<entry>VP8 video elementary stream.</entry>

		<entry>VP8 video elementary stream.</entry>

	  </row>

	  </row>

	</tbody>

	</tbody>

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

+760 −0

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

+33 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,22 @@ 
      </tgroup>

      </tgroup>

    </table>

    </table>





    <table frame="none" pgwide="1" id="v4l2-event-src-change">

      <title>struct <structname>v4l2_event_src_change</structname></title>

      <tgroup cols="3">

	&cs-str;

	<tbody valign="top">

	  <row>

	    <entry>__u32</entry>

	    <entry><structfield>changes</structfield></entry>

	    <entry>

	      A bitmask that tells what has changed. See <xref linkend="src-changes-flags" />.

	    </entry>

	  </row>

	</tbody>

      </tgroup>

    </table>



    <table pgwide="1" frame="none" id="changes-flags">

    <table pgwide="1" frame="none" id="changes-flags">

      <title>Changes</title>

      <title>Changes</title>

      <tgroup cols="3">

      <tgroup cols="3">
@@ -270,6 +286,23 @@ 
	</tbody>

	</tbody>

      </tgroup>

      </tgroup>

    </table>

    </table>



    <table pgwide="1" frame="none" id="src-changes-flags">

      <title>Source Changes</title>

      <tgroup cols="3">

	&cs-def;

	<tbody valign="top">

	  <row>

	    <entry><constant>V4L2_EVENT_SRC_CH_RESOLUTION</constant></entry>

	    <entry>0x0001</entry>

	    <entry>This event gets triggered when a resolution change is

	    detected at an input. This can come from an input connector or

	    from a video decoder.

	    </entry>

	  </row>

	</tbody>

      </tgroup>

    </table>

  </refsect1>

  </refsect1>

  <refsect1>

  <refsect1>

    &return-value;

    &return-value;