Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 676ee36b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'patchwork' into v4l_for_linus 

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...
parents b18042a6 e183201b

Documentation/DocBook/media/v4l/biblio.xml

+5 −6
Original line number Diff line number Diff line 
  <bibliography>

    <title>References</title>



    <biblioentry id="eia608">

      <abbrev>EIA&nbsp;608-B</abbrev>

    <biblioentry id="cea608">

      <abbrev>CEA&nbsp;608-E</abbrev>

      <authorgroup>

	<corpauthor>Electronic Industries Alliance (<ulink

url="http://www.eia.org">http://www.eia.org</ulink>)</corpauthor>

	<corpauthor>Consumer Electronics Association (<ulink

url="http://www.ce.org">http://www.ce.org</ulink>)</corpauthor>

      </authorgroup>

      <title>EIA 608-B "Recommended Practice for Line 21 Data

Service"</title>

      <title>CEA-608-E R-2014 "Line 21 Data Services"</title>

    </biblioentry>



    <biblioentry id="en300294">

Documentation/DocBook/media/v4l/compat.xml

+1 −1
Original line number Diff line number Diff line
@@ -2491,7 +2491,7 @@ that used it. It was originally scheduled for removal in 2.6.35. 
        </listitem>

        <listitem>

	  <para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event

	  changes flag. See <xref linkend="changes-flags"/>.</para>

	  changes flag. See <xref linkend="ctrl-changes-flags"/>.</para>

        </listitem>

      </orderedlist>

    </section>

Documentation/DocBook/media/v4l/dev-sliced-vbi.xml

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ ETS&nbsp;300&nbsp;231, lsb first transmitted.</entry> 
	  <row>

	    <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry>

	    <entry>0x1000</entry>

	    <entry><xref linkend="eia608" /></entry>

	    <entry><xref linkend="cea608" /></entry>

	    <entry>NTSC line 21, 284 (second field 21)</entry>

	    <entry>Two bytes in transmission order, including parity

bit, lsb first transmitted.</entry>

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

+27 −65
Original line number Diff line number Diff line
@@ -143,86 +143,28 @@ 
	  <row>

	    <entry></entry>

	    <entry>struct</entry>

	    <entry><structfield>v4l</structfield></entry>

	    <entry><structfield>dev</structfield></entry>

	    <entry></entry>

	    <entry>Valid for V4L sub-devices and nodes only.</entry>

	    <entry>Valid for (sub-)devices that create a single device node.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>major</structfield></entry>

	    <entry>V4L device node major number. For V4L sub-devices with no

	    device node, set by the driver to 0.</entry>

	    <entry>Device node major number.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>minor</structfield></entry>

	    <entry>V4L device node minor number. For V4L sub-devices with no

	    device node, set by the driver to 0.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>struct</entry>

	    <entry><structfield>fb</structfield></entry>

	    <entry></entry>

	    <entry>Valid for frame buffer nodes only.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>major</structfield></entry>

	    <entry>Frame buffer device node major number.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>minor</structfield></entry>

	    <entry>Frame buffer device node minor number.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>struct</entry>

	    <entry><structfield>alsa</structfield></entry>

	    <entry></entry>

	    <entry>Valid for ALSA devices only.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>card</structfield></entry>

	    <entry>ALSA card number</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>device</structfield></entry>

	    <entry>ALSA device number</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry></entry>

	    <entry>__u32</entry>

	    <entry><structfield>subdevice</structfield></entry>

	    <entry>ALSA sub-device number</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>int</entry>

	    <entry><structfield>dvb</structfield></entry>

	    <entry></entry>

	    <entry>DVB card number</entry>

	    <entry>Device node minor number.</entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>__u8</entry>

	    <entry><structfield>raw</structfield>[180]</entry>

	    <entry><structfield>raw</structfield>[184]</entry>

	    <entry></entry>

	    <entry></entry>

	  </row>
@@ -253,8 +195,24 @@ 
	    <entry>ALSA card</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB</constant></entry>

	    <entry>DVB card</entry>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_FE</constant></entry>

	    <entry>DVB frontend devnode</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DEMUX</constant></entry>

	    <entry>DVB demux devnode</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DVR</constant></entry>

	    <entry>DVB DVR devnode</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_CA</constant></entry>

	    <entry>DVB CAM devnode</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_NET</constant></entry>

	    <entry>DVB network devnode</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV</constant></entry>
@@ -282,6 +240,10 @@ 
	    it in some digital video standard, with appropriate embedded timing

	    signals.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_TUNER</constant></entry>

	    <entry>TV and/or radio tuner</entry>

	  </row>

	</tbody>

      </tgroup>

    </table>

Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml

+40 −39
Original line number Diff line number Diff line
@@ -303,45 +303,6 @@ for a pixel lie next to each other in memory.</para> 
	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

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

	    <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>

	    <entry>'BGRH'</entry>

	    <entry></entry>

	    <entry>b<subscript>5</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	    <entry>g<subscript>5</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>r<subscript>5</subscript></entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	  </row>

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

	    <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>

	    <entry>'BGR3'</entry>
@@ -404,6 +365,46 @@ for a pixel lie next to each other in memory.</para> 
	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

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

	    <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>

	    <entry>'BGRH'</entry>

	    <entry></entry>

	    <entry>b<subscript>5</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	    <entry>g<subscript>5</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>r<subscript>5</subscript></entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry></entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	    <entry>-</entry>

	  </row>

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

	    <entry><constant>V4L2_PIX_FMT_ABGR32</constant></entry>

	    <entry>'AR24'</entry>