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

Commit a14c5d29 authored by Petr Cvek's avatar Petr Cvek Committed by Mauro Carvalho Chehab
Browse files

[media] pxa_camera: Fix incorrect test in the image size generation 



During the transfer from the soc_camera a test in pxa_mbus_image_size()
got removed. Without it any PXA_MBUS_LAYOUT_PACKED format causes either
the return of a wrong value (PXA_MBUS_PACKING_2X8_PADHI doubles
the correct value) or EINVAL (PXA_MBUS_PACKING_NONE and
PXA_MBUS_PACKING_EXTEND16). This was observed in an error from the ffmpeg
(for some of the YUYV subvariants).

This patch re-adds the same test as in soc_camera version.

Signed-off-by: default avatarPetr Cvek <petr.cvek@tul.cz>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 30a42a1c

drivers/media/platform/pxa_camera.c

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ static s32 pxa_mbus_bytes_per_line(u32 width, const struct pxa_mbus_pixelfmt *mf 
static s32 pxa_mbus_image_size(const struct pxa_mbus_pixelfmt *mf,

			u32 bytes_per_line, u32 height)

{

	if (mf->layout == PXA_MBUS_LAYOUT_PACKED)

		return bytes_per_line * height;



	switch (mf->packing) {

	case PXA_MBUS_PACKING_2X8_PADHI:

		return bytes_per_line * height * 2;