Re: [PATCH 1/3] v4l: Clean up sub-device format documentation
Hi Hans, On Fri, Nov 14, 2014 at 09:29:35AM +0100, Hans Verkuil wrote: > Two small notes... > > On 11/09/2014 12:04 AM, Sakari Ailus wrote: > > The sub-device format documentation documented scaling configuration through > > formats. Instead the compose selection rectangle is elsewhere documented to > > be used for the purpose. Remove scaling related part of the documentation. > > > > Signed-off-by: Sakari Ailus > > --- > > Documentation/DocBook/media/v4l/dev-subdev.xml | 108 > > ++-- > > 1 file changed, 62 insertions(+), 46 deletions(-) > > > > diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml > > b/Documentation/DocBook/media/v4l/dev-subdev.xml > > index d15aaf8..dbf9965 100644 > > --- a/Documentation/DocBook/media/v4l/dev-subdev.xml > > +++ b/Documentation/DocBook/media/v4l/dev-subdev.xml > > @@ -195,53 +195,59 @@ > > Sample Pipeline Configuration > > > > > > - > > - > > - > > - > > - > > + > > + > > + > > + > > + > > + > > > > > > > > - Sensor/0 > > - Frontend/0 > > - Frontend/1 > > - Scaler/0 > > - Scaler/1 > > + Sensor/0 format > > + Frontend/0 format > > + Frontend/1 format > > + Scaler/0 format > > + Scaler/0 compose selection rectangle > > + Scaler/1 format > > > > > > > > > > Initial state > > - 2048x1536 > > - - > > - - > > - - > > - - > > + 2048x1536/SGRBG8_1X8 > > + (default) > > + (default) > > + (default) > > + (default) > > + (default) > > > > > > - Configure frontend input > > - 2048x1536 > > - 2048x1536 > > - 2046x1534 > > - - > > - - > > + Configure frontend sink format > > + 2048x1536/SGRBG8_1X8 > > + 2048x1536/SGRBG8_1X8 > > + 2046x1534/SGRBG8_1X8 > > + (default) > > + (default) > > + (default) > > > > > > - Configure scaler input > > - 2048x1536 > > - 2048x1536 > > - 2046x1534 > > - 2046x1534 > > - 2046x1534 > > + Configure scaler sink format > > + 2048x1536/SGRBG8_1X8 > > + 2048x1536/SGRBG8_1X8 > > + 2046x1534/SGRBG8_1X8 > > + 2046x1534/SGRBG8_1X8 > > + 0,0/2046x1534 > > + 2046x1534/SGRBG8_1X8 > > > > > > - Configure scaler output > > - 2048x1536 > > - 2048x1536 > > - 2046x1534 > > - 2046x1534 > > - 1280x960 > > + Configure scaler sink compose selection > > + 2048x1536/SGRBG8_1X8 > > + 2048x1536/SGRBG8_1X8 > > + 2046x1534/SGRBG8_1X8 > > + 2046x1534/SGRBG8_1X8 > > + 0,0/1280x960 > > + 1280x960/SGRBG8_1X8 > > > > > > > > @@ -249,19 +255,29 @@ > > > > > > > > - Initial state. The sensor output is set to its native > > 3MP > > - resolution. Resolutions on the host frontend and scaler input and output > > - pads are undefined. > > - The application configures the frontend input pad > > resolution to > > - 2048x1536. The driver propagates the format to the frontend output pad. > > - Note that the propagated output format can be different, as in this > > case, > > - than the input format, as the hardware might need to crop pixels (for > > - instance when converting a Bayer filter pattern to RGB or YUV). > > Does this Bayer filter note no longer apply? Cropping is out of scope as it requires using the selection API. I can add this where selections are discussed in more detail, if you think it's relevant. IMO this may be a property of a particular piece of hardware, and there are a lot more reasons to crop a a few pixels than just that. > > > > - The application configures the scaler input pad > > resolution to > > - 2046x1534 to match the frontend output resolution. The driver propagates > > - the format to the scaler output pad. > > - The application configures the scaler output pad > > resolution to > > - 1280x960. > > + Initial state. The sensor source pad format is > > + set to its native 3MP size and V4L2_MBUS_FMT_SGRBG8_1X8 > > + media bus code. Formats on the host frontend and scaler sink > > + and source pads have the default values, as well as the > > + compose rectangle on the scaler's sind pad. > > sind -> sink I'll fix that. -- Kind regards, Sakari Ailus e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/3] v4l: Clean up sub-device format documentation
Two small notes... On 11/09/2014 12:04 AM, Sakari Ailus wrote: > The sub-device format documentation documented scaling configuration through > formats. Instead the compose selection rectangle is elsewhere documented to > be used for the purpose. Remove scaling related part of the documentation. > > Signed-off-by: Sakari Ailus > --- > Documentation/DocBook/media/v4l/dev-subdev.xml | 108 > ++-- > 1 file changed, 62 insertions(+), 46 deletions(-) > > diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml > b/Documentation/DocBook/media/v4l/dev-subdev.xml > index d15aaf8..dbf9965 100644 > --- a/Documentation/DocBook/media/v4l/dev-subdev.xml > +++ b/Documentation/DocBook/media/v4l/dev-subdev.xml > @@ -195,53 +195,59 @@ > Sample Pipeline Configuration > > > - > - > - > - > - > + > + > + > + > + > + > > > > - Sensor/0 > - Frontend/0 > - Frontend/1 > - Scaler/0 > - Scaler/1 > + Sensor/0 format > + Frontend/0 format > + Frontend/1 format > + Scaler/0 format > + Scaler/0 compose selection rectangle > + Scaler/1 format > > > > > Initial state > - 2048x1536 > - - > - - > - - > - - > + 2048x1536/SGRBG8_1X8 > + (default) > + (default) > + (default) > + (default) > + (default) > > > - Configure frontend input > - 2048x1536 > - 2048x1536 > - 2046x1534 > - - > - - > + Configure frontend sink format > + 2048x1536/SGRBG8_1X8 > + 2048x1536/SGRBG8_1X8 > + 2046x1534/SGRBG8_1X8 > + (default) > + (default) > + (default) > > > - Configure scaler input > - 2048x1536 > - 2048x1536 > - 2046x1534 > - 2046x1534 > - 2046x1534 > + Configure scaler sink format > + 2048x1536/SGRBG8_1X8 > + 2048x1536/SGRBG8_1X8 > + 2046x1534/SGRBG8_1X8 > + 2046x1534/SGRBG8_1X8 > + 0,0/2046x1534 > + 2046x1534/SGRBG8_1X8 > > > - Configure scaler output > - 2048x1536 > - 2048x1536 > - 2046x1534 > - 2046x1534 > - 1280x960 > + Configure scaler sink compose selection > + 2048x1536/SGRBG8_1X8 > + 2048x1536/SGRBG8_1X8 > + 2046x1534/SGRBG8_1X8 > + 2046x1534/SGRBG8_1X8 > + 0,0/1280x960 > + 1280x960/SGRBG8_1X8 > > > > @@ -249,19 +255,29 @@ > > > > - Initial state. The sensor output is set to its native > 3MP > - resolution. Resolutions on the host frontend and scaler input and output > - pads are undefined. > - The application configures the frontend input pad > resolution to > - 2048x1536. The driver propagates the format to the frontend output pad. > - Note that the propagated output format can be different, as in this > case, > - than the input format, as the hardware might need to crop pixels (for > - instance when converting a Bayer filter pattern to RGB or YUV). Does this Bayer filter note no longer apply? > > - The application configures the scaler input pad > resolution to > - 2046x1534 to match the frontend output resolution. The driver propagates > - the format to the scaler output pad. > - The application configures the scaler output pad > resolution to > - 1280x960. > + Initial state. The sensor source pad format is > + set to its native 3MP size and V4L2_MBUS_FMT_SGRBG8_1X8 > + media bus code. Formats on the host frontend and scaler sink > + and source pads have the default values, as well as the > + compose rectangle on the scaler's sind pad. sind -> sink > + > + The application configures the frontend sink > + pad format's size to 2048x1536 and its media bus code to > + V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the format to > + the frontend source pad. > + > + The application configures the scaler sink pad > + format's size to 2046x1534 and the media bus code to > + V4L2_MBUS_FMT_SGRBG_1X8 to match the frontend source size and > + media bus code. The media bus code on the sink pad is set to > + V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the size to the > + compose selection rectangle on the scaler's sink pad, and the > + format to the scaler source pad. > + > + The application configures the compose > + selection rectangle of the scaler's sink pad and scaler source > + pad format's size
[PATCH 1/3] v4l: Clean up sub-device format documentation
The sub-device format documentation documented scaling configuration through formats. Instead the compose selection rectangle is elsewhere documented to be used for the purpose. Remove scaling related part of the documentation. Signed-off-by: Sakari Ailus --- Documentation/DocBook/media/v4l/dev-subdev.xml | 108 ++-- 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml b/Documentation/DocBook/media/v4l/dev-subdev.xml index d15aaf8..dbf9965 100644 --- a/Documentation/DocBook/media/v4l/dev-subdev.xml +++ b/Documentation/DocBook/media/v4l/dev-subdev.xml @@ -195,53 +195,59 @@ Sample Pipeline Configuration - - - - - + + + + + + - Sensor/0 - Frontend/0 - Frontend/1 - Scaler/0 - Scaler/1 + Sensor/0 format + Frontend/0 format + Frontend/1 format + Scaler/0 format + Scaler/0 compose selection rectangle + Scaler/1 format Initial state - 2048x1536 - - - - - - - - + 2048x1536/SGRBG8_1X8 + (default) + (default) + (default) + (default) + (default) - Configure frontend input - 2048x1536 - 2048x1536 - 2046x1534 - - - - + Configure frontend sink format + 2048x1536/SGRBG8_1X8 + 2048x1536/SGRBG8_1X8 + 2046x1534/SGRBG8_1X8 + (default) + (default) + (default) - Configure scaler input - 2048x1536 - 2048x1536 - 2046x1534 - 2046x1534 - 2046x1534 + Configure scaler sink format + 2048x1536/SGRBG8_1X8 + 2048x1536/SGRBG8_1X8 + 2046x1534/SGRBG8_1X8 + 2046x1534/SGRBG8_1X8 + 0,0/2046x1534 + 2046x1534/SGRBG8_1X8 - Configure scaler output - 2048x1536 - 2048x1536 - 2046x1534 - 2046x1534 - 1280x960 + Configure scaler sink compose selection + 2048x1536/SGRBG8_1X8 + 2048x1536/SGRBG8_1X8 + 2046x1534/SGRBG8_1X8 + 2046x1534/SGRBG8_1X8 + 0,0/1280x960 + 1280x960/SGRBG8_1X8 @@ -249,19 +255,29 @@ - Initial state. The sensor output is set to its native 3MP - resolution. Resolutions on the host frontend and scaler input and output - pads are undefined. - The application configures the frontend input pad resolution to - 2048x1536. The driver propagates the format to the frontend output pad. - Note that the propagated output format can be different, as in this case, - than the input format, as the hardware might need to crop pixels (for - instance when converting a Bayer filter pattern to RGB or YUV). - The application configures the scaler input pad resolution to - 2046x1534 to match the frontend output resolution. The driver propagates - the format to the scaler output pad. - The application configures the scaler output pad resolution to - 1280x960. + Initial state. The sensor source pad format is + set to its native 3MP size and V4L2_MBUS_FMT_SGRBG8_1X8 + media bus code. Formats on the host frontend and scaler sink + and source pads have the default values, as well as the + compose rectangle on the scaler's sind pad. + + The application configures the frontend sink + pad format's size to 2048x1536 and its media bus code to + V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the format to + the frontend source pad. + + The application configures the scaler sink pad + format's size to 2046x1534 and the media bus code to + V4L2_MBUS_FMT_SGRBG_1X8 to match the frontend source size and + media bus code. The media bus code on the sink pad is set to + V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the size to the + compose selection rectangle on the scaler's sink pad, and the + format to the scaler source pad. + + The application configures the compose + selection rectangle of the scaler's sink pad and scaler source + pad format's size to 1280x960. + -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majo