From: Mauro Carvalho Chehab Date: Thu, 15 Dec 2016 10:38:35 +0000 (-0200) Subject: Merge branch 'patchwork' into v4l_for_linus X-Git-Tag: Ubuntu-4.10.0-19.21~1964^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=65390ea01ce678379da32b01f39fcfac4903f256;p=mirror_ubuntu-artful-kernel.git Merge branch 'patchwork' into v4l_for_linus * patchwork: (496 commits) [media] v4l: tvp5150: Add missing break in set control handler [media] v4l: tvp5150: Don't inline the tvp5150_selmux() function [media] v4l: tvp5150: Compile tvp5150_link_setup out if !CONFIG_MEDIA_CONTROLLER [media] em28xx: don't store usb_device at struct em28xx [media] em28xx: use usb_interface for dev_foo() calls [media] em28xx: don't change the device's name [media] mn88472: fix chip id check on probe [media] mn88473: fix chip id check on probe [media] lirc: fix error paths in lirc_cdev_add() [media] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs [media] s5p-mfc: Rework clock handling [media] s5p-mfc: Don't keep clock prepared all the time [media] s5p-mfc: Kill all IS_ERR_OR_NULL in clocks management code [media] s5p-mfc: Remove dead conditional code [media] s5p-mfc: Ensure that clock is disabled before turning power off [media] s5p-mfc: Remove special clock rate management [media] s5p-mfc: Use printk_ratelimited for reporting ioctl errors [media] s5p-mfc: Set DMA_ATTR_ALLOC_SINGLE_PAGES [media] vivid: Set color_enc on HSV formats [media] v4l2-tpg: Init hv_enc field with a valid value ... --- 65390ea01ce678379da32b01f39fcfac4903f256 diff --cc Documentation/media/typical_media_device.svg index f0c82f72c4b6,000000000000..0c8abd69f39a mode 100644,000000..100644 --- a/Documentation/media/typical_media_device.svg +++ b/Documentation/media/typical_media_device.svg @@@ -1,28 -1,0 +1,2948 @@@ + - Audio decoder - Video decoder - Audio encoder - Button Key/IR input logic - EEPROM - Sensor - System Bus - Demux - Conditional Access Module - Video encoder - Radio / Analog TV - Digital TV - PS.: picture is not complete: other blocks may be present - Webcam - Processing blocks - Smartcard - TunerFM/TV - Satellite Equipment Control (SEC) - Demod - I2C Bus (control bus) - Digital TV Frontend - - CPU - PCI, USB, SPI, I2C, ... - Bridge - DMA - ++image/svg+xmlAudio decoder ++Video decoder ++Audio encoder ++Button Key/IR input logic ++EEPROM ++Sensor ++System Bus ++Demux ++Conditional Access Module ++Video encoder ++Radio / Analog TV ++Digital TV ++PS.: picture is not complete: other blocks may be present ++Webcam ++Processing blocks ++Smartcard ++TunerFM/TV ++Satellite Equipment Control (SEC) ++Demod ++I2C Bus (control bus) ++Digital TV Frontend ++ ++CPU ++PCI, USB, SPI, I2C, ... ++Bridge ++ DMA ++ diff --cc Documentation/media/uapi/v4l/subdev-image-processing-crop.svg index ba02e6f6214d,000000000000..1903dd3846c2 mode 100644,000000..100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg @@@ -1,313 -1,0 +1,302 @@@ + + + + + + image/svg+xml + ++ + + + + + + + ++ transform="translate(-1.6002426,-1.1395339)"> + + + + ++ transform="translate(-1.6002426,-1.1395339)"> + + + + + sink ++ x="72.899757" ++ y="226.61047" ++ id="tspan20">sink + crop ++ x="72.899757" ++ y="242.61047" ++ id="tspan22">crop + selection ++ x="72.899757" ++ y="258.61047" ++ id="tspan24">selection + + + ++ x="27.899757" ++ y="156.86047" ++ id="tspan28" /> + + + sink media ++ x="6.938117" ++ y="156.77448" ++ id="tspan32">sink media + bus format ++ x="6.938117" ++ y="172.77448" ++ id="tspan34">bus format + + + source media ++ x="348.17374" ++ y="153.86047" ++ id="tspan38">source media + bus format ++ x="348.17374" ++ y="169.86047" ++ id="tspan40">bus format + + ++ transform="translate(-1.6002426,-1.1395339)"> + + + + + + + + - ++ - - ++ cx="473.10001" ++ cy="219.98399" ++ id="ellipse58" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.6002426,-1.1395339)"> + + + + + + pad 1 (source) ++ x="505.30774" ++ y="208.66048" ++ id="tspan74">pad 1 (source) + + - ++ - - ++ cx="-20.398199" ++ cy="241.51199" ++ id="ellipse78" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.6002426,-1.1395339)"> + + + + + + pad 0 (sink) ++ x="-149.45824" ++ y="228.66048" ++ id="tspan94">pad 0 (sink) + + diff --cc Documentation/media/uapi/v4l/subdev-image-processing-full.svg index c82291a4493e,000000000000..91cf51832c12 mode 100644,000000..100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg @@@ -1,769 -1,0 +1,742 @@@ + + + + + + image/svg+xml + ++ + + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + - ++ - ++ - ++ ++ cy="166.71201" ++ id="ellipse18" ++ r="8.5" /> + + - ++ - - ++ cx="815.23199" ++ cy="205.18401" ++ id="ellipse22" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + pad 0 (sink) ++ x="-141.45824" ++ y="147.3051" ++ id="tspan46">pad 0 (sink) + + + pad 2 (source) ++ x="847.54175" ++ y="187.3051" ++ id="tspan50">pad 2 (source) + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ x="29.001762" ++ y="81.305092" ++ id="tspan66" /> + + + sink media ++ x="8.040122" ++ y="81.218895" ++ id="tspan70">sink media + bus format ++ x="8.040122" ++ y="97.219093" ++ id="tspan72">bus format + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + + + + sink compose ++ x="333.20578" ++ y="141.7471" ++ id="tspan90">sink compose + selection (scaling) ++ x="333.20578" ++ y="157.7471" ++ id="tspan92">selection (scaling) + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + source media ++ x="688.00177" ++ y="97.43309" ++ id="tspan102">source media + bus format ++ x="688.00177" ++ y="113.43309" ++ id="tspan104">bus format + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + + + + sink compose ++ x="323.50177" ++ y="95.305092" ++ id="tspan122">sink compose + bounds selection ++ x="323.50177" ++ y="111.30509" ++ id="tspan124">bounds selection + + - ++ - ++ - ++ ++ cy="341.51199" ++ id="ellipse132" ++ r="8.5" /> + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + pad 1 (sink) ++ x="-140.49823" ++ y="321.30508" ++ id="tspan144">pad 1 (sink) + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ x="30.401762" ++ y="252.10509" ++ id="tspan160" /> + + + + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + + + - ++ - ++ - ++ ++ cy="343.98401" ++ id="ellipse194" ++ r="8.5" /> + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + + pad 3 (source) ++ x="847.74976" ++ y="326.10507" ++ id="tspan206">pad 3 (source) + + + sink ++ x="195.50177" ++ y="83.305092" ++ id="tspan210">sink + crop ++ x="195.50177" ++ y="99.305092" ++ id="tspan212">crop + selection ++ x="195.50177" ++ y="115.30509" ++ id="tspan214">selection + + + source ++ x="551.50177" ++ y="87.305092" ++ id="tspan218">source + crop ++ x="551.50177" ++ y="103.30509" ++ id="tspan220">crop + selection ++ x="551.50177" ++ y="119.30509" ++ id="tspan222">selection + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + ++ transform="translate(-1.4982376,-7.6949076)"> + + + + + diff --cc Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg index e7b3786f8a9b,000000000000..cedcbf598923 mode 100644,000000..100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg @@@ -1,560 -1,0 +1,540 @@@ + + + + + + image/svg+xml + ++ + + + + + + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + sink ++ x="58.399757" ++ y="218.14409" ++ id="tspan20">sink + crop ++ x="58.399757" ++ y="234.14409" ++ id="tspan22">crop + selection ++ x="58.399757" ++ y="250.14409" ++ id="tspan24">selection + + + ++ x="27.899757" ++ y="152.14409" ++ id="tspan28" /> + + + sink media ++ x="6.938117" ++ y="152.05809" ++ id="tspan32">sink media + bus format ++ x="6.938117" ++ y="168.05809" ++ id="tspan34">bus format + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + + + + sink compose ++ x="333.10376" ++ y="143.58609" ++ id="tspan52">sink compose + selection (scaling) ++ x="333.10376" ++ y="159.58609" ++ id="tspan54">selection (scaling) + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + source ++ x="541.7218" ++ y="143.58609" ++ id="tspan64">source + crop ++ x="541.7218" ++ y="159.58609" ++ id="tspan66">crop + selection ++ x="541.7218" ++ y="175.58609" ++ id="tspan68">selection + + + source media ++ x="689.89978" ++ y="151.27209" ++ id="tspan72">source media + bus format ++ x="689.89978" ++ y="167.27209" ++ id="tspan74">bus format + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + + + - ++ - - ++ cx="808.09998" ++ cy="249.98399" ++ id="ellipse92" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + pad 1 (source) ++ x="840.3078" ++ y="233.94409" ++ id="tspan108">pad 1 (source) + + - ++ - - ++ cx="-20.398199" ++ cy="241.51199" ++ id="ellipse112" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + pad 0 (sink) ++ x="-149.45824" ++ y="223.94409" ++ id="tspan128">pad 0 (sink) + + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + + + - ++ - - ++ cx="805.59998" ++ cy="384.08401" ++ id="ellipse148" ++ r="8.5" /> ++ ++ + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + + pad 2 (source) ++ x="837.8078" ++ y="368.04407" ++ id="tspan164">pad 2 (source) + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + + ++ transform="translate(-1.6002426,-5.8559115)"> + + + + +