On 27.05.20 01:09, Tomasz Figa wrote:
On Fri, May 15, 2020 at 4:30 PM Dafna Hirschfeld <dafna.hirschfeld@xxxxxxxxxxxxx> wrote:If the capture format is YUV444M then the memory input format should be YUV422, so the resizer should not change the default hdiv, vdiv in that case. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@xxxxxxxxxxxxx> --- drivers/staging/media/rkisp1/rkisp1-resizer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c index 04a29af8cc92..5f9740ddd558 100644 --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c @@ -394,10 +394,11 @@ static void rkisp1_rsz_config(struct rkisp1_resizer *rsz, * (4:2:2 -> 4:2:0 for example). So the width/height of the CbCr * streams should be set according to the pixel format in the capture. * The resizer always gets the input as YUV422. If the capture format - * is RGB then the memory input (the resizer output) should be YUV422 - * so we use the hdiv, vdiv of the YUV422 info in this case. + * is RGB or YUV444 then the memory input (the resizer output) should + * be YUV422 so we use the hdiv, vdiv of the YUV422 info in this case. */ - if (v4l2_is_format_yuv(cap->pix.info)) { + if (v4l2_is_format_yuv(cap->pix.info) && + cap->pix.info->format != V4L2_PIX_FMT_YUV444M) { src_c.width = cap->pix.info->hdiv; src_c.height = cap->pix.info->vdiv;As pointed out in another thread, this should have been the original size divided by the divisor and not just the latter alone. It seems a bit suspicious to me that we don't need to upscale the chroma planes here, because it would mean that the MI itself would be doing some horizontal pixel doubling. The hardware documentation doesn't really explain this, though. Have you been able to validate that the setting without upscaling indeed produces correct output?
Hi, I investigated it again, without this patch, the frames on mainpath for YUV444 look good: https://imgur.com/a/NtazWhY but there is a problem on selfpath: https://imgur.com/a/vQJPqAn This patch somehow solves the problem on selfpath but ruins the frames on mainpath. I think the bug is actually in another place in the code. The function 'rkisp1_sp_config' sets a constant value RKISP1_MI_CTRL_SP_INPUT_YUV422 as the input format on the RKISP1_CIF_MI_CTRL register. But the value should be set according to the configuration. For some reason the problem arises only when trying to capture yuv444. When I capture yuv420 on the selfpath the frame looks good although the value RKISP1_MI_CTRL_SP_INPUT_YUV422 is set. Setting the the SP_INPUT_* according to the configuration seems to solve the problem. Thanks, Dafna
Best regards, Tomasz
