mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 14:40:12 -04:00
media: cedrus: Stop direct calls to queue num_buffers field
Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. This allows us to change how the number of buffers is computed in the future. While at it, check the return value of vb2_get_buffer(). Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> CC: Maxime Ripard <mripard@kernel.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
88d9ce34a6
commit
e1d2fcf99d
@@ -653,8 +653,13 @@ static void cedrus_h264_stop(struct cedrus_ctx *ctx)
|
||||
|
||||
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
|
||||
|
||||
for (i = 0; i < vq->num_buffers; i++) {
|
||||
buf = vb2_to_cedrus_buffer(vb2_get_buffer(vq, i));
|
||||
for (i = 0; i < vb2_get_num_buffers(vq); i++) {
|
||||
struct vb2_buffer *vb = vb2_get_buffer(vq, i);
|
||||
|
||||
if (!vb)
|
||||
continue;
|
||||
|
||||
buf = vb2_to_cedrus_buffer(vb);
|
||||
|
||||
if (buf->codec.h264.mv_col_buf_size > 0) {
|
||||
dma_free_attrs(dev->dev,
|
||||
|
||||
@@ -869,8 +869,13 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx)
|
||||
|
||||
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
|
||||
|
||||
for (i = 0; i < vq->num_buffers; i++) {
|
||||
buf = vb2_to_cedrus_buffer(vb2_get_buffer(vq, i));
|
||||
for (i = 0; i < vb2_get_num_buffers(vq); i++) {
|
||||
struct vb2_buffer *vb = vb2_get_buffer(vq, i);
|
||||
|
||||
if (!vb)
|
||||
continue;
|
||||
|
||||
buf = vb2_to_cedrus_buffer(vb);
|
||||
|
||||
if (buf->codec.h265.mv_col_buf_size > 0) {
|
||||
dma_free_attrs(dev->dev,
|
||||
|
||||
Reference in New Issue
Block a user