diff options
author | Archit Taneja <archit@ti.com> | 2014-03-11 03:47:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-04-07 08:44:25 -0400 |
commit | bbe24c6759b341ab2504318e50ccd5482f5e6002 (patch) | |
tree | a4294b9f7b290c7aa219c6db36676330267899b3 /drivers/media | |
parent | 5269fef77e14c22b1fde44bc0973a18cf233f778 (diff) |
[media] v4l: ti-vpe: retain v4l2_buffer flags for captured buffers
The dequed CAPTURE_MPLANE type buffers don't contain the flags that the
originally queued OUTPUT_MPLANE type buffers have. This breaks compliance.
Copy the source v4l2_buffer flags to the destination v4l2_buffer flags before
they are dequed.
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/ti-vpe/vpe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c index b64f29a54891..5c421886d97c 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c | |||
@@ -1280,13 +1280,12 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) | |||
1280 | s_buf = &s_vb->v4l2_buf; | 1280 | s_buf = &s_vb->v4l2_buf; |
1281 | d_buf = &d_vb->v4l2_buf; | 1281 | d_buf = &d_vb->v4l2_buf; |
1282 | 1282 | ||
1283 | d_buf->flags = s_buf->flags; | ||
1284 | |||
1283 | d_buf->timestamp = s_buf->timestamp; | 1285 | d_buf->timestamp = s_buf->timestamp; |
1284 | d_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; | 1286 | if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE) |
1285 | d_buf->flags |= s_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; | ||
1286 | if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE) { | ||
1287 | d_buf->flags |= V4L2_BUF_FLAG_TIMECODE; | ||
1288 | d_buf->timecode = s_buf->timecode; | 1287 | d_buf->timecode = s_buf->timecode; |
1289 | } | 1288 | |
1290 | d_buf->sequence = ctx->sequence; | 1289 | d_buf->sequence = ctx->sequence; |
1291 | 1290 | ||
1292 | d_q_data = &ctx->q_data[Q_DATA_DST]; | 1291 | d_q_data = &ctx->q_data[Q_DATA_DST]; |