diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-31 08:18:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-18 11:13:34 -0400 |
commit | 961ae44980034f82d037c982e5b2f8258e055d63 (patch) | |
tree | 41840c7438c22448f2a06e891765a712457e7b60 /include/media | |
parent | 36aee5ff9098a871bda38dbbdad40ad59f6535cf (diff) |
[media] media v4l2-mem2mem: fix src/out and dst/cap num_rdy
src bufs belong to out queue, dst bufs belong to in queue. Currently
this is not a real problem since all users currently need exactly one
input and one output buffer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-mem2mem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 16ac4733e80d..131cc4a53675 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h | |||
@@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb); | |||
140 | static inline | 140 | static inline |
141 | unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) | 141 | unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) |
142 | { | 142 | { |
143 | return m2m_ctx->cap_q_ctx.num_rdy; | 143 | return m2m_ctx->out_q_ctx.num_rdy; |
144 | } | 144 | } |
145 | 145 | ||
146 | /** | 146 | /** |
@@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) | |||
150 | static inline | 150 | static inline |
151 | unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) | 151 | unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) |
152 | { | 152 | { |
153 | return m2m_ctx->out_q_ctx.num_rdy; | 153 | return m2m_ctx->cap_q_ctx.num_rdy; |
154 | } | 154 | } |
155 | 155 | ||
156 | void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx); | 156 | void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx); |