Message ID | 20230123071708.2670751-1-christianshewitt@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | media: meson: vdec: remove redundant if statement | expand |
On 23/01/2023 08:17, Christian Hewitt wrote: > From: Benjamin Roszak <benjamin545@gmail.com> > > Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a > condition to enter the if statement where this additional check is made. > > Signed-off-by: Benjamin Roszak <benjamin545@gmail.com> > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > drivers/staging/media/meson/vdec/esparser.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c > index 86ccc8937afc..7b15fc54efe4 100644 > --- a/drivers/staging/media/meson/vdec/esparser.c > +++ b/drivers/staging/media/meson/vdec/esparser.c > @@ -314,8 +314,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) > num_dst_bufs = codec_ops->num_pending_bufs(sess); > > num_dst_bufs += v4l2_m2m_num_dst_bufs_ready(sess->m2m_ctx); > - if (sess->fmt_out->pixfmt == V4L2_PIX_FMT_VP9) > - num_dst_bufs -= 3; > + num_dst_bufs -= 3; > > if (esparser_vififo_get_free_space(sess) < payload_size || > atomic_read(&sess->esparser_queued_bufs) >= num_dst_bufs) Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c index 86ccc8937afc..7b15fc54efe4 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -314,8 +314,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) num_dst_bufs = codec_ops->num_pending_bufs(sess); num_dst_bufs += v4l2_m2m_num_dst_bufs_ready(sess->m2m_ctx); - if (sess->fmt_out->pixfmt == V4L2_PIX_FMT_VP9) - num_dst_bufs -= 3; + num_dst_bufs -= 3; if (esparser_vififo_get_free_space(sess) < payload_size || atomic_read(&sess->esparser_queued_bufs) >= num_dst_bufs)