mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
V4L/DVB (10081): pxa-camera: call try_fmt() camera device method with correct pixel format
With the introduction of the format conversion support in soc-camera, we now also have to take care to pass the correct pixel format to the camera driver when calling its try_fmt() method. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
64f5905ee7
commit
bf507158eb
1 changed files with 7 additions and 1 deletions
|
@ -1218,6 +1218,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
|
|||
const struct soc_camera_format_xlate *xlate;
|
||||
struct v4l2_pix_format *pix = &f->fmt.pix;
|
||||
__u32 pixfmt = pix->pixelformat;
|
||||
int ret;
|
||||
|
||||
xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
|
||||
if (!xlate) {
|
||||
|
@ -1240,8 +1241,13 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
|
|||
DIV_ROUND_UP(xlate->host_fmt->depth, 8);
|
||||
pix->sizeimage = pix->height * pix->bytesperline;
|
||||
|
||||
/* camera has to see its format, but the user the original one */
|
||||
pix->pixelformat = xlate->cam_fmt->fourcc;
|
||||
/* limit to sensor capabilities */
|
||||
return icd->ops->try_fmt(icd, f);
|
||||
ret = icd->ops->try_fmt(icd, f);
|
||||
pix->pixelformat = xlate->host_fmt->fourcc;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int pxa_camera_reqbufs(struct soc_camera_file *icf,
|
||||
|
|
Loading…
Reference in a new issue