| Message ID | 20220328195936.82552-17-nicolas.dufresne@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,01/24] media: h264: Increase reference lists size to 32 | expand |
Hey Nicolas, On 28.03.2022 15:59, Nicolas Dufresne wrote: >From: Jonas Karlman <jonas@kwiboo.se> > >Ensure decoded CAPTURE buffer resolution is larger or equal to the coded >OPTUPT buffer resolution. s/OPTUPT/OUTPUT/ > >Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> >--- > drivers/staging/media/rkvdec/rkvdec.c | 2 ++ > 1 file changed, 2 insertions(+) > >diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c >index 05824f1997f7..22c0382c579e 100644 >--- a/drivers/staging/media/rkvdec/rkvdec.c >+++ b/drivers/staging/media/rkvdec/rkvdec.c >@@ -269,6 +269,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, > pix_mp->pixelformat = coded_desc->decoded_fmts[0]; > > /* Always apply the frmsize constraint of the coded end. */ s/frmsize/framesize/ s/constraint/constraints/ s/coded end/coded format/ Greetings, Sebastian >+ pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); >+ pix_mp->height = max(pix_mp->height, ctx->coded_fmt.fmt.pix_mp.height); > v4l2_apply_frmsize_constraints(&pix_mp->width, > &pix_mp->height, > &coded_desc->frmsize); >-- >2.34.1 >
Hey Nicolas, Also typo in title: s/Ensure decoded resolution fit coded resolution/ Ensure decoded resolution fits coded resolution/ Greetings, Sebastian On 29.03.2022 17:39, Sebastian Fricke wrote: >Hey Nicolas, > >On 28.03.2022 15:59, Nicolas Dufresne wrote: >>From: Jonas Karlman <jonas@kwiboo.se> >> >>Ensure decoded CAPTURE buffer resolution is larger or equal to the coded >>OPTUPT buffer resolution. > >s/OPTUPT/OUTPUT/ > >> >>Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> > >>--- >>drivers/staging/media/rkvdec/rkvdec.c | 2 ++ >>1 file changed, 2 insertions(+) >> >>diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c >>index 05824f1997f7..22c0382c579e 100644 >>--- a/drivers/staging/media/rkvdec/rkvdec.c >>+++ b/drivers/staging/media/rkvdec/rkvdec.c >>@@ -269,6 +269,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, >> pix_mp->pixelformat = coded_desc->decoded_fmts[0]; >> >> /* Always apply the frmsize constraint of the coded end. */ > >s/frmsize/framesize/ >s/constraint/constraints/ >s/coded end/coded format/ > >Greetings, >Sebastian > >>+ pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); >>+ pix_mp->height = max(pix_mp->height, ctx->coded_fmt.fmt.pix_mp.height); >> v4l2_apply_frmsize_constraints(&pix_mp->width, >> &pix_mp->height, >> &coded_desc->frmsize); >>-- >>2.34.1 >>
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 05824f1997f7..22c0382c579e 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -269,6 +269,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, pix_mp->pixelformat = coded_desc->decoded_fmts[0]; /* Always apply the frmsize constraint of the coded end. */ + pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); + pix_mp->height = max(pix_mp->height, ctx->coded_fmt.fmt.pix_mp.height); v4l2_apply_frmsize_constraints(&pix_mp->width, &pix_mp->height, &coded_desc->frmsize);