Messages in this thread |  | | Date | Sat, 24 Dec 2022 09:03:59 +0100 | Subject | Re: [PATCH v2] hantro: Fix JPEG encoder ENUM_FRMSIZE on RK3399 | From | Benjamin Gaignard <> |
| |
Le 23/12/2022 à 19:16, Nicolas Dufresne a écrit : > Since 79c987de8b354, enumerating framesize on format set with "MODE_NONE" > (any raw formats) is reporting an invalid frmsize. > > Size: Stepwise 0x0 - 0x0 with step 0/0 > > Before this change, the driver would return EINVAL, which is also invalid but > worked in GStreamer. The original intent was not to implement it, hence the > -ENOTTY return in this change. While drivers should implement ENUM_FRMSIZE for > all formats and queues, this change is limited in scope to fix the regression. > > This fixes taking picture in Gnome Cheese software, or any software using > GSteamer to encode JPEG with hardware acceleration. > > Fixes: 79c987de8b354 ("media: hantro: Use post processor scaling capacities") > Reported-by: Robert Mader <robert.mader@collabora.com> > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> --- > drivers/media/platform/verisilicon/hantro_v4l2.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c > index 2c7a805289e7b..30e650edaea8a 100644 > --- a/drivers/media/platform/verisilicon/hantro_v4l2.c > +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c > @@ -161,8 +161,11 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, > } > > /* For non-coded formats check if postprocessing scaling is possible */ > - if (fmt->codec_mode == HANTRO_MODE_NONE && hantro_needs_postproc(ctx, fmt)) { > - return hanto_postproc_enum_framesizes(ctx, fsize); > + if (fmt->codec_mode == HANTRO_MODE_NONE) { > + if (hantro_needs_postproc(ctx, fmt)) > + return hanto_postproc_enum_framesizes(ctx, fsize); > + else > + return -ENOTTY; > } else if (fsize->index != 0) { > vpu_debug(0, "invalid frame size index (expected 0, got %d)\n", > fsize->index);
|  |