Skip to content

Commit 685b3ce

Browse files
committed
bootcode: usb: Dont overwrite configured parameters
firmware: usb: Force MSD app to use CM3 pin conf firmware: IL ISP: Fix typo in logging firmware: IL ISP: Add black level and lens shading controls firmware: isp: Correct ISP Bayer stride calcs for supported formats firmware: Remove unused duplicate versions of vc_sm_defs.h firmware: IL camera: add get_parameter for OMX_IndexConfigCustomAwbGains firmware: IL resize: Support get_parameter OMX_IndexConfigCommonInputCro firmware: MMAL/RIL: Add MMAL_PARAMETER_RESIZE_PARAMS / OMX_IndexParamResize mapping firmware: ISP IL: Add lresize output firmware: MMAL/RIL: Add mapping for OMX_IndexConfigCommon[In|Out]putCrop firmware: MMAL/RIL: Correct handling of MMAL_PARAMETER_VIDEO_SOURCE_PATTERN firmware: IL ISP: Add H & V flip support firmware: IL ISP: Implement OMX_IndexConfigCommonInputCrop firmware: imx219: Refactor exposure calculations firmware: dmalib: Stop spinning on dma_pause if END is signalled See: #824
1 parent 446b264 commit 685b3ce

File tree

11 files changed

+38
-23
lines changed

11 files changed

+38
-23
lines changed

boot/bootcode.bin

0 Bytes
Binary file not shown.

boot/fixup.dat

4 Bytes
Binary file not shown.

boot/fixup_cd.dat

0 Bytes
Binary file not shown.

boot/fixup_db.dat

10 Bytes
Binary file not shown.

boot/fixup_x.dat

6 Bytes
Binary file not shown.

boot/start.elf

4 KB
Binary file not shown.

boot/start_cd.elf

-32 Bytes
Binary file not shown.

boot/start_db.elf

4.53 KB
Binary file not shown.

boot/start_x.elf

3.84 KB
Binary file not shown.

documentation/ilcomponents/index.html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -251,16 +251,7 @@ <h1>VMCS-X OpenMAX IL Components</h1>
251251
<tr><td border="1" port="221" bgcolor="red">221</td></tr>
252252
</table></td>
253253
</tr></table></a>
254-
<p><a href="isp.html"><table cellspacing="0" cellpadding="2"><tr>
255-
<td cellpadding="0">
256-
<table border="0" cellborder="1" cellspacing="0">
257-
<tr><td border="1" port="360" bgcolor="pink">360</td></tr>
258-
</table></td>
259-
<td bgcolor="grey" border="1">isp</td> <td cellpadding="0">
260-
<table border="0" cellborder="1" cellspacing="0">
261-
<tr><td border="1" port="361" bgcolor="pink">361</td></tr>
262-
</table></td>
263-
</tr></table></a>
254+
<p><a href="isp.html"></a>
264255
<p><a href="rawcam.html"><table cellspacing="0" cellpadding="2"><tr>
265256
<td bgcolor="grey" border="1">rawcam</td> <td cellpadding="0">
266257
<table border="0" cellborder="1" cellspacing="0">

documentation/ilcomponents/isp.html

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,52 @@
4848
</table><td>
4949

5050
<h1>OMX.broadcom.isp</h1>
51-
<table cellspacing="0" cellpadding="2"><tr>
52-
<td cellpadding="0">
53-
<table border="0" cellborder="1" cellspacing="0">
54-
<tr><td border="1" port="360" bgcolor="pink">360</td></tr>
55-
</table></td>
56-
<td bgcolor="grey" border="1">isp</td> <td cellpadding="0">
57-
<table border="0" cellborder="1" cellspacing="0">
58-
<tr><td border="1" port="361" bgcolor="pink">361</td></tr>
59-
</table></td>
60-
</tr></table><p>
51+
<p>
6152
<p>
6253
This component wraps the ISP (Image Sensor Processor) hardware block to
6354
offer hardware accelerated format conversion and resizing.
55+
It has one input port taking Bayer, YUV or RGB images in numerous different formats.
56+
It has two output ports:
57+
Port 361 supports various RGB and YUV formats.
58+
Port 362 is off the low res resizer which can only downscale. Due to this
59+
port 362 must be at a lower resolution to port 361. If set to a higher resolution
60+
then the port will effectively be disabled and no ouput produced. It also doesn't have
61+
the colour conversion block, and so only supports YUV formats.
62+
<p>
63+
Port 361 is treated as the main output - the pipeline will stall until an output
64+
buffer is available on that port. That includes if port 361 is disabled then no
65+
processing will occur.
66+
If no output buffer is available on port 362 when both an input buffer and
67+
port 361 output buffer are available, the frame will be processed with the low
68+
resolution output disabled.
6469
<p>
6570
Please note that this component has been developed for use under MMAL. It has
6671
not been tested at all under IL, so there may be unexpected behaviour under IL.
67-
It is also not considered to be production quality code - please use with caution.
72+
It is also not considered to be production quality code yet - please use with caution.
6873
<p>
6974
<p>
7075
<table border="1" cellspacing="0" cellpadding="2"><tr><td>Port<td>Index<td>Notes
71-
<tr valign="top"><td rowspan="6">360<td><tt>OMX_IndexParamPortDefinition</tt>
76+
<tr valign="top"><td rowspan="7">360<td><tt>OMX_IndexParamPortDefinition</tt>
7277
<td> Set this to control the input size of the image. Typically this is
7378
called by the component itself when this port is tunnelled with an
7479
appropriate output port. The stripe height a multiple of 16, and
7580
>= <tt>nFrameHeight</tt>.
7681
<tr valign="top"><td><tt>OMX_IndexConfigCommonInputCrop</tt>
7782
<td> Allows cropping at the input. Cropping can be changed at any time.
83+
Cropping dimensions can not exceed the image size set via
84+
the image will result in the crop width/height being initially clipped,
85+
but if the clipped width/height is <= 0, then the whole crop region
86+
will be ignored.
87+
A region with x, y, width, and height all of 0 is interpreted as no
88+
cropping (ie width and height set to image width/height).
89+
Please note that this is applied BEFORE any mirror operations have
90+
been performed via OMX_IndexConfigCommonMirror.
91+
<tr valign="top"><td><tt>OMX_IndexConfigCommonMirror</tt>
92+
<td> Query / set the mirroring requirements for images.
93+
Please note that this is currently restricted to being set before
94+
both input and high res ports are active.
95+
Also note that this is applied AFTER any cropping has been performed
96+
via OMX_IndexConfigCommonInputCrop.
7897
<tr valign="top"><td><tt><a href="prop.html#OMX_IndexParamBrcmBayerOrder">OMX_IndexParamBrcmBayerOrder</a></tt>
7998
<td> Set / query the Bayer order for the incoming data.
8099
<tr valign="top"><td><tt><a href="prop.html#OMX_IndexParamCameraPoolToEncoderFunction">OMX_IndexParamCameraPoolToEncoderFunction</a></tt>
@@ -93,13 +112,18 @@ <h1>OMX.broadcom.isp</h1>
93112
<tt>nStride</tt> must be a multiple of 32, or a
94113
multiple of 64 for RGBA32 format.
95114
FIXME: Correct the list of supported formats
96-
<tr valign="top"><td rowspan="2">360 361<td><tt>OMX_IndexParamImagePortFormat</tt>
115+
<tr valign="top"><td rowspan="1">362<td><tt>OMX_IndexParamPortDefinition</tt>
116+
<td> Query this to show what the output size will be. This port
117+
must be at a lower resolution than 361, and only supports YUV
118+
formats, not the RGB formats that port 361 does.
119+
<tr valign="top"><td rowspan="2">360 361 362<td><tt>OMX_IndexParamImagePortFormat</tt>
97120
<td> Set / query the image port format used. These ports support RGB565,
98121
RGBA32 or YUV420 raw bitmap formats.
99122
FIXME: Correct the list of supported formats
100123
<tr valign="top"><td><tt><a href="prop.html#OMX_IndexParamColorSpace">OMX_IndexParamColorSpace</a></tt>
101124
<td> Set/retrieve the image colour space that buffers on the port should be
102125
processed with.
126+
FIXME: Implement me.
103127
</table>
104128

105129
</table>

0 commit comments

Comments
 (0)